So where do fixes to the 2.0 go? Master and cherry-picked or 2.0 and merged down.
I'm not sure why this is being treated differently from an LTS - which I would guess 2.0 would be - otherwise why does it need stabilization - it's similar yet different... If it's not a LTS version (as the next LTS version has been choses and it wasn' t 2.0 why is this extra needed - how is this different from weeklies?) Is this a new process going forward etc etc... IIRC it was also stated that there was going to be a code review of 2.0 before - I guess this is the initial merge 2.0 branch to master - is that no longer planned/ being swept under the carpet? - otherwise I would have probably been a lot more diligent / rigorous on code reviewing all the changes going in. On Wednesday, March 23, 2016 at 10:07:49 PM UTC, Daniel Beck wrote: > > Hi everyone, > > The following is my current plan and proposal how to handle the '2.0' and > 'master' branches leading up to 2.0 release. Please respond if I overlooked > something. You can find the current 2.0 release schedule here: > > > https://wiki.jenkins-ci.org/display/JENKINS/Jenkins+2.0#Jenkins2.0-RoughTimeline > > <https://www.google.com/url?q=https%3A%2F%2Fwiki.jenkins-ci.org%2Fdisplay%2FJENKINS%2FJenkins%2B2.0%23Jenkins2.0-RoughTimeline&sa=D&sntz=1&usg=AFQjCNHEkjz_ElbK0MXZafQAdavT_vfeFg> > > > > March 23: > We're aiming for the 2.0 beta release from the '2.0' branch later today. > 'master' has been merged into '2.0' earlier today. > > --- > > March 27(ish): Release of Jenkins 1.655 from 'master'. This will be the > last release of the 1.x line (see March 30). > > --- > > March 30: > In one week, 'master' will again be merged into '2.0'. This will be > released as 2.0 RC from the '2.0' branch. Ideally we're not going to merge > crazy stuff into 'master' between now and next Wednesday to keep the risk > of the 2.0 RC being terrible low. > > Any unmerged pull requests against '2.0' will be closed, and '2.0' will be > merged into 'master'. This means that from that point on, anything > happening on the 'master' branch will be released as 2.1, as it makes no > sense to continue releasing 1.x weeklies while 2.0 code is frozen and we're > preparing the release. > > Pull requests targeting 2.1 and beyond should be opened against 'master'. > > --- > > April 3: > This weekly release will be skipped. > > --- > > April 6: > Release 2.0 from the '2.0' branch (unless a critical bug is found in RC, > of course). Merge '2.0' into 'master'. > > --- > > April 10(ish): > Release 2.1 from the 'master' branch. > > > -- You received this message because you are subscribed to the Google Groups "Jenkins Developers" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-dev/6dad6d41-f182-4ddb-8a54-1ca5054dddfa%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
