This really helps me understand the branching! Awesome strategy. Thanks, Ben.
David > On Oct 21, 2015, at 10:37, Benjamin Reed <ran...@opennms.org> wrote: > > I mentioned it briefly in yesterday's post, but we have branched in > preparation of doing a 17.0.0 release in the not-too-distant future. > > Also, we have a 16.0.4 release that is ready to go out pending a fix for > the deadlock issue here: > > http://issues.opennms.org/browse/NMS-7899 > > This means we're in the unusual state of doing prep for multiple > releases at once, as well as bug an future-feature work, so here is a > breakdown of where to do what. > > Bug Fixes > --------- > > Critical bug fixes that affect Meridian should still be merged to the > Foundation branch. Trivial bug fixes should be merged to the > release-16.0.4 branch. Any other larger (but not immediately impacting) > stabilization and bug fix work should be merged to release-17.0.0. > > Feature Work > ------------ > > There are a few features left that are still slated for 17.0.0 that need > to be completed, those should be merged to the release-17.0.0 branch. > All other feature work should be based on develop (future 18). > > Merges > ------ > > Bamboo is configured to auto-merge these branches, assuming there are no > conflicts: > > Foundation -> Meridian private branch > Foundation -> release-16.0.4 > release-16.0.4 -> release-17.0.0 > release-17.0.0 -> develop > > If you have any questions as to what branch to do a pull-request > against, please don't hesitate to ask. > > Thanks, > Ben > _______________________________________________ > Dev mailing list > d...@mail.opennms.com > http://mail.opennms.com/mailman/listinfo/dev ------------------------------------------------------------------------------ _______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/index.php/Mailing_List_FAQ opennms-devel mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-devel
