Yes, certain things checked into a version like 4.5 need to make sure they never make it to master.
SVN has a way to mark a commit so it would not be merged to another branch like master is for us. I don't know if I Git has such a feature. On Thursday, October 23, 2014, Daan Hoogland <daan.hoogl...@gmail.com> wrote: > not nice, so merge back is no longer an option. I think I am almost > ready to admit to that. > > On Thu, Oct 23, 2014 at 3:31 PM, Mike Tutkowski > <mike.tutkow...@solidfire.com <javascript:;>> wrote: > > Actually...this was a 4.5-only change. > > > > On Thursday, October 23, 2014, Daan Hoogland <daan.hoogl...@gmail.com > <javascript:;>> > > wrote: > > > >> great hope you didn't check it into master so wecan see if the merge > >> strategy works:) > >> > >> On Wed, Oct 22, 2014 at 11:57 PM, Mike Tutkowski > >> <mike.tutkow...@solidfire.com <javascript:;> <javascript:;>> wrote: > >> > Just an FYI that I checked code directly into 4.5 today, but it was > only > >> > related to the SolidFire driver (no general-purpose CloudStack code > was > >> > part of the commit). > >> > > >> > 2d7187e002e6b5b164c226fdde994a3a92cb9dda > >> > > >> > On Tue, Oct 21, 2014 at 10:50 AM, David Nalley <da...@gnsa.us > <javascript:;> > >> <javascript:;>> wrote: > >> > > >> >> We are well past feature freeze - but I haven't started a hard code > >> >> freeze; though it is imminent. > >> >> > >> >> --David > >> >> > >> >> On Tue, Oct 21, 2014 at 12:46 PM, Mike Tutkowski > >> >> <mike.tutkow...@solidfire.com <javascript:;> <javascript:;>> wrote: > >> >> > Hi Daan, > >> >> > > >> >> > Do you know if the check-in protocol for 4.5 (or rather for any > >> branched > >> >> > release) is formally documented on the Wiki somewhere? > >> >> > > >> >> > If it's not, it's probably harder to "enforce" it. > >> >> > > >> >> > Thanks! > >> >> > Mike > >> >> > > >> >> > On Tue, Oct 21, 2014 at 1:21 AM, Daan Hoogland < > >> daan.hoogl...@gmail.com <javascript:;> <javascript:;>> > >> >> > wrote: > >> >> >> > >> >> >> David, > >> >> >> > >> >> >> I keep seeing commits passing to the 4.5 branch. As you are the > RM I > >> am > >> >> >> not > >> >> >> reverting them. Should I? Not one of them has come from a hotfix > >> branch > >> >> >> for > >> >> >> weeks. > >> >> >> > >> >> >> -- > >> >> >> Daan > >> >> > > >> >> > > >> >> > > >> >> > > >> >> > -- > >> >> > Mike Tutkowski > >> >> > Senior CloudStack Developer, SolidFire Inc. > >> >> > e: mike.tutkow...@solidfire.com <javascript:;> <javascript:;> > >> >> > o: 303.746.7302 > >> >> > Advancing the way the world uses the cloud™ > >> >> > >> > > >> > > >> > > >> > -- > >> > *Mike Tutkowski* > >> > *Senior CloudStack Developer, SolidFire Inc.* > >> > e: mike.tutkow...@solidfire.com <javascript:;> <javascript:;> > >> > o: 303.746.7302 > >> > Advancing the way the world uses the cloud > >> > <http://solidfire.com/solution/overview/?video=play>*™* > >> > >> > >> > >> -- > >> Daan > >> > > > > > > -- > > *Mike Tutkowski* > > *Senior CloudStack Developer, SolidFire Inc.* > > e: mike.tutkow...@solidfire.com <javascript:;> > > o: 303.746.7302 > > Advancing the way the world uses the cloud > > <http://solidfire.com/solution/overview/?video=play>*™* > > > > -- > Daan > -- *Mike Tutkowski* *Senior CloudStack Developer, SolidFire Inc.* e: mike.tutkow...@solidfire.com o: 303.746.7302 Advancing the way the world uses the cloud <http://solidfire.com/solution/overview/?video=play>*™*
