Merge path for bugs on 3.0 is pretty brutal at this point. Good thing 2 will drop off when we GA 5.0.
Updated wiki w/new branches plus some examples: link <https://cwiki.apache.org/confluence/display/CASSANDRA/Patching%2C+versioning%2C+and+LTS+releases> On Mon, Aug 7, 2023, at 11:18 AM, Mick Semb Wever wrote: > > Forward merging cassandra-4.1 … cassandra-5.0 … trunk is now required ! > > trunk is still got 5.0 in the build.xml, but that's only temporary until > 18705 lands, and of no harm i believe… (i could easily be wrong, but not > AFAIK) > > > On Mon, 7 Aug 2023 at 13:38, Brandon Williams <dri...@gmail.com> wrote: >> Is this intended to be used now and change the merge order? I ask >> because 18705 mentions bumping build.xml and CHANGES.txt amongst >> others that haven't been done which is leading to confusion. >> >> Kind Regards, >> Brandon >> >> On Sat, Aug 5, 2023 at 4:46 PM Mick Semb Wever <m...@apache.org> wrote: >> > >> > >> > With no objections, and everything folk mentioned above in, the >> > cassandra-5.0 branch is cut. >> > >> > Next steps are bumping trunk to 5.1 and then cutting a 5.0-alpha1 >> > >> > The bumping to 5.1 has a few steps involved in it, but the initial in-tree >> > PRs are ready for review, with CI being run, see CASSANDRA-18705 >> > >> > >> > >> > On Sat, 29 Jul 2023 at 00:00, Brandon Williams <dri...@gmail.com> wrote: >> >> >> >> +1 to everything stated here. >> >> >> >> Kind Regards, >> >> Brandon >> >> >> >> On Wed, Jul 26, 2023 at 5:28 PM Mick Semb Wever <m...@apache.org> wrote: >> >> > >> >> > >> >> > The previous thread¹ on when to freeze 5.0 landed on freezing the first >> >> > week of August, with a waiver in place for TCM and Accord to land later >> >> > (but before October). >> >> > >> >> > With JDK8 now dropped and SAI and UCS merged, the only expected 5.0 >> >> > work that hasn't landed is Vector search (CEP-30). >> >> > >> >> > Are there any objections to a waiver on Vector search? All the >> >> > groundwork: SAI and the vector type; has been merged, with all >> >> > remaining work expected to land in August. >> >> > >> >> > I'm keen to freeze and see us shift gears – there's already SO MUCH in >> >> > 5.0 and a long list of flakies. It takes time and patience to triage >> >> > and identify the bugs that hit us before GA. The freeze is about being >> >> > "mostly feature complete", so we have room for things before our first >> >> > beta (precedence is to ask). If we hope for a GA by December, account >> >> > for the 6 weeks turnaround time for cutting and voting on one alpha, >> >> > one beta, and one rc release, and the quiet period that August is, we >> >> > really only have September and October left. >> >> > >> >> > I already feel this is asking a bit of a miracle from us given how 4.1 >> >> > went (and I'm hoping I will be proven wrong). >> >> > >> >> > In addition, are there any objections to cutting an 5.0-alpha1 release >> >> > as soon as we freeze? >> >> > >> >> > This is on the understanding vector, tcm and accord will become >> >> > available in later alphas. Originally the discussion¹ was waiting for >> >> > Accord for alpha1, but a number of folk off-list have requested earlier >> >> > alphas to help with testing. >> >> > >> >> > >> >> > ¹) https://lists.apache.org/thread/9c5cnn57c7oqw8wzo3zs0dkrm4f17lm3
