On Thu, 1 Nov 2012, Cl?udio Martins wrote: > On Wed, 31 Oct 2012 14:38:28 -0700 (PDT) Sage Weil <sage@xxxxxxxxxxx> wrote: > > On Wed, 31 Oct 2012, Noah Watkins wrote: > > > Which branch is the freeze taken against? master? > > > > Right. Basically, every 3-4 weeks: > > > > - next is tagged as v0.XX > > - and is merged back into master > > - next branch is reset to current master > > - testing branch is reset to just-tagged v0.XX > > > > Hmm, interesting. But doesn't that mean that when the real v0.XX is > later officially _released_, its top commit might not be the commit > that was tagged as v0.XX? Assuming that issues are found after the > testing branch is reset to v0.XX, fixes would go on top of v0.XX, right? > > Am I missing something, or people checking out a v0.XX with git might > not be getting the real v0.XX that was released as tarballs? The releases and tarballs contain *exactly* the content that is tagged v0.X. The branches may accumulate additional fixes after that, which will later be tagged with a v0.X.Y point release. Since we've started maintaing a stable release, we haven't done point releases for the development 'testing' releases, although if there are important bugs we may need to do so in the future. The 'stable' branch tracks the last stable release (currently argonaut) and is where bug fixes accumulate until the next release. For example, stable current contains v0.48.2 and several additional commits (mostly backports of proviioning scripts to support the ceph-deploy tool that we're working on). sage -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
