Andor, In my opinion it is better to port few patches to released branches. Basically only CVEs and critical bugfixes. The rationale is: - every patch that has been prepared for master branch could not fit cleanly to other branches, even if the cherry-pick succeeds, we could break it - we should encourage users to upgrade to the latest version - now that the community is more alive, it is easier to cut releases, and especially if you release ofter an upgrade won't be scary for users, "release early, release often" - users trust "stable branches" and I generally prefer to not touch them if not necessary
So, as a summary: - master -> everything - branch-3.6 -> CVEs, bugfixes, small improvements that do not affect core features or critical code paths (low risk), documentation - branch-3.5 -> CVEs, critical bugfixes, nothing else - branch-3.4 -> CVEs, only until June We should make 3.6 the stable and used version, users should be very comfortable with the upgrade. The world is moving to 3.5 from 3.4, it will take time. If we port too many improvements to 3.5, why should they upgrade to 3.6 ? Enrico Il giorno mer 6 mag 2020 alle ore 15:15 Andor Molnar <[email protected]> ha scritto: > 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 > > > > > >
