On Fri, Jul 18, 2014 at 04:03:32PM +0200, Anders Blomdell wrote: > On 2014-07-17 20:22, Vijay Bellur wrote: > > Hi All, > > > > A new branch, 'release-3.6', has been branched from this commit in > > master: > > > > commit 950f9d8abe714708ca62b86f304e7417127e1132 Author: Jeff Darcy > > <jdarcy@xxxxxxxxxx> Date: Tue Jul 8 21:56:04 2014 -0400 > > > > dht: fix rename race > > > > > > You can checkout this branch through: > > > > $git checkout -b release-3.6 origin/release-3.6 > > > > rfc.sh is being updated to send patches to the appropriate branch. > > The plan is to have all 3.6.x releases happen off this branch. If you > > need any fix to be part of a 3.4.x release, please send out a > > backport of the same from master to release-3.4 after it has been > > accepted in master. More notes on backporting are available at [1]. > > Shouldn't the root of this branch get a tag to avoid this weirdness: > > # git checkout -b release-3.6 origin/release-3.6 > Branch release-3.6 set up to track remote branch release-3.6 from origin. > Switched to a new branch 'release-3.6' > > # git describe > v3.5qa2-762-g950f9d8 > > or have I missed some git magic? No, you're correct. We should push a tag like 'v3.6alpha' or 'v3.6dev' and a 'v3.7dev' to the repository. These tags will get ordered correctly when v3.6.0 and v3.7.0 get released (Well, it would go wrong with v3.7alpha as non-update for v3.7dev, but do we really care about that?) Thanks, Niels _______________________________________________ Gluster-devel mailing list Gluster-devel@xxxxxxxxxxx http://supercolony.gluster.org/mailman/listinfo/gluster-devel
