In general I agree. But I am a bit hesitant here:
> branch-3.6: > - everything, except new features Sometimes it is hard to distinguish "new features" and "improvements". I think this should be decided on a case-by-case basis. E.g. this recent change seems to be an improvement for me https://issues.apache.org/jira/browse/ZOOKEEPER-3796 But still I wouldn't push it into a bugfix release, as it is documented as an 'experimental feature'. Kind regards, Mate On Wed, May 6, 2020 at 3:15 PM Andor Molnar <[email protected]> wrote: > Hi! > > We started a discussion on Slack about what to backport to which branches, > because I was missing some commits from 3.5 and 3.6 which I think should > have been backported for proper maintenance. > > These 2 branches are currently the active releases of Apache ZooKeeper, so > I think it’s important to make sure all committers are on the same page in > terms of backporting accepted patches. > > Mate provided a quick list of different categories that patches usually > fall into: > - bugfixes > - CVEs > - test fixes > - documentation fixes > - maven fixes > - new features > - improvements > > My suggestion is: > > master: > - everything > > branch-3.6: > - everything, except new features > > branch-3.5: > - bugfixes > - CVEs > - test, doc fixes > - maven fixes if possible > > branch-3.4 > - CVEs (until 1st of June, 2020) > > Please share your thoughts. > > Andor > > > > > >
