> -----Original Message----- > From: Ewan Mellor [mailto:ewan.mel...@eu.citrix.com] > Sent: Monday, August 13, 2012 6:07 PM > To: cloudstack-dev@incubator.apache.org > Cc: Alex Huang > Subject: RE: [ASFCS40] Branching for 4.0? > > > -----Original Message----- > > From: Chip Childers [mailto:chip.child...@sungard.com] > > Sent: 13 August 2012 17:29 > > To: cloudstack-dev@incubator.apache.org > > Cc: Alex Huang > > Subject: Re: [ASFCS40] Branching for 4.0? > > > > On Mon, Aug 13, 2012 at 8:22 PM, Ewan Mellor > > <ewan.mel...@eu.citrix.com> wrote: > > >> -----Original Message----- > > >> From: Chip Childers [mailto:chip.child...@sungard.com] > > >> Sent: 13 August 2012 17:09 > > >> To: cloudstack-dev@incubator.apache.org > > >> Subject: [ASFCS40] Branching for 4.0? > > >> > > >> All, > > >> > > >> It didn't look like the 4.0 branch had been created yet, but we had > > >> discussed creating it today. I went ahead and created it just now. > > >> > > >> Unless there are serious objections to the branch having been > > >> created, I guess we're considering this branch to be the working > > >> copy that we should all be testing / stabilizing. > > >> > > >> Please yell if someone was expecting this to be done later. > > >> Otherwise, please make sure that any 4.0 bug fixes are patched in > > >> both master and the 4.0 branch! > > > > > > Thanks Chip. We were just talking about that -- you beat us to it, > > > but we > > were right about to do the same. > > > > > > Alex has agreed to be gatekeeper for this branch, so it'll be his > > > job to > > perform that extra review on what goes into the release branch, and to > > make sure that the quality stays high. Reviews can continue into > > master as normal, and Alex will pull across things that are suitable > > for release. This will hopefully be everything, but he'll be an extra check > to make sure. > > > > > > Thanks, > > > > > > Ewan. > > > > > > > > > > Ewan - Just to make sure it's straight in my head (and for everyone > > else): You're suggesting that everyone works in master, and that Alex > > will pull everything that looks right from master to 4.0? And by > > "everyone", we're talking both committers committing directly into > > master, as well as folks submitting review requests via review board? > > Yes, that's exactly what I was saying. That way, we do our normal quality > checks (either through Review Board or through trusting the committers to > get it right by themselves) and then Alex will pass a second pair of eyes over > things before he cherry-picks them, to make sure that the release branch is > extra high quality. > > I still would like everyone to act as if they are closing down for a release, > and be careful about what goes into master. Having a release branch > doesn't mean that we open master up to any old thing (if we did that, > cherry-picking would be a nightmare). > > Cheers, > > Ewan.
That makes things more convenient from my side. =P Will