I would prefer the merge forward strategy as Rajani proposed, in which case whoever merges inthe oldest branch could, it would then be propagated upwards to master 'automatically'.
At the moment the author is the logical authority (pun not avoided) On Thu, Nov 13, 2014 at 5:11 PM, Mike Tutkowski <mike.tutkow...@solidfire.com> wrote: > That's a good point, Daan. > > So, how's about this? We should make it the responsibility of the person > who created the hotfix branch to delete it (presumably after he/she has > determined that the fix(es) in the hotfix branch have gone into all > applicable locations). > > On Thu, Nov 13, 2014 at 8:59 AM, Daan Hoogland <daan.hoogl...@gmail.com> > wrote: > >> I don't mind deleting it either but in our present model it needs >> merging/picking into several branches. (cursing intended) >> >> On Thu, Nov 13, 2014 at 4:51 PM, Mike Tutkowski >> <mike.tutkow...@solidfire.com> wrote: >> > I don't mind deleting the branch myself, but I wonder if it makes more >> > sense for the RM to do so once he/she has merged the change(s) in from >> the >> > hotfix branch (as sort of another indication to the hotfix-branch >> submitter >> > that his/her fix(es) have been merged). >> > >> > On Wed, Nov 12, 2014 at 2:02 AM, Daan Hoogland <daan.hoogl...@gmail.com> >> > wrote: >> > >> >> go ahead, no protocol carved in stone. What do you suggest? >> >> >> >> On Wed, Nov 12, 2014 at 5:18 AM, Mike Tutkowski >> >> <mike.tutkow...@solidfire.com> wrote: >> >> > Hey Daan, >> >> > >> >> > What's the protocol once you merge the code in (which you have already >> >> done >> >> > for me here)? Do I delete the hotfix branch or is that something you >> plan >> >> > on doing? >> >> > >> >> > Thanks! >> >> > Mike >> >> > >> >> > On Tue, Nov 11, 2014 at 9:17 AM, Daan Hoogland < >> daan.hoogl...@gmail.com> >> >> > wrote: >> >> > >> >> >> merged >> >> >> >> >> >> On Tue, Nov 11, 2014 at 5:05 PM, Mike Tutkowski >> >> >> <mike.tutkow...@solidfire.com> wrote: >> >> >> > Hi Daan, >> >> >> > >> >> >> > Here is the ticket: >> >> >> > >> >> >> > https://issues.apache.org/jira/browse/CLOUDSTACK-7883 >> >> >> > >> >> >> > Here is the hotfix branch: >> >> >> > >> >> >> > hotfix/4.4/CLOUDSTACK-7883 >> >> >> > >> >> >> > Thanks! >> >> >> > >> >> >> > Mike >> >> >> > >> >> >> > On Tue, Nov 11, 2014 at 8:03 AM, Daan Hoogland < >> >> daan.hoogl...@gmail.com> >> >> >> > wrote: >> >> >> > >> >> >> >> Mike, make your own. name it hotfix/4.4/<your jira ticket> and >> >> contact >> >> >> me. >> >> >> >> >> >> >> >> On Tue, Nov 11, 2014 at 3:55 PM, Mike Tutkowski >> >> >> >> <mike.tutkow...@solidfire.com> wrote: >> >> >> >> > Yes, I have one. SolidFire-driver only code. Do we have a branch >> >> for >> >> >> this >> >> >> >> > already? >> >> >> >> > >> >> >> >> > On Tuesday, November 11, 2014, Daan Hoogland < >> >> daan.hoogl...@gmail.com >> >> >> > >> >> >> >> > wrote: >> >> >> >> > >> >> >> >> >> H, >> >> >> >> >> >> >> >> >> >> As we made a big boogy by have a different commit id used for >> the >> >> >> >> >> artifact as for the tag/vote, I need to create a new relase >> >> including >> >> >> >> >> vote. Does anybody have last minute entries/fixes they want >> in? I >> >> >> plan >> >> >> >> >> to build tonight (about 21:00 UTC) >> >> >> >> >> >> >> >> >> >> regards, >> >> >> >> >> -- >> >> >> >> >> 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>*™* >> >> >> >> >> >> >> >> >> >> >> >> >> >> >> >> -- >> >> >> >> 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>*™* >> >> >> >> >> >> >> >> >> >> >> >> -- >> >> >> 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>*™* >> >> >> >> >> >> >> >> -- >> >> 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>*™* >> >> >> >> -- >> 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>*™* -- Daan
