All of lore.kernel.org
 help / color / mirror / Atom feed
* branches
@ 2013-01-08 18:39 Sage Weil
  2013-01-08 18:48 ` branches Mark Nelson
  2013-01-18 18:32 ` branches Sage Weil
  0 siblings, 2 replies; 6+ messages in thread
From: Sage Weil @ 2013-01-08 18:39 UTC (permalink / raw)
  To: ceph-devel

I'd like to adjust the branches we're maintaining in ceph.git.  Currently:

master
 - active development
next
 - frozen for next release
 - bug fixes only
 - regularly merged back into master
testing
 - last development release
 - cherry-pick -x'd critical fixes
 - packages at ceph.com/debian-testing, /rpm-testing
stable
 - argonaut long-term backport series
 - cherry-pick -x'd critical fixes
 - packages at ceph.com/debian-argonaut, /debian

The stable is ambiguous, and testing is a confusing name.  Instead, I 
propose:

master  -- same
next    -- same
last
 - last release (instead of 'testing')
 - packages at /debian-testing and /debian-last, /rpm-testing, /rpm-last
bobtail
 - bobtail backport series 0.56.x
 - packages at /debian-bobtail (and /debian, until cuttlefish), 
   /rpm-bobtail, /rpm
argonaut
 - argonaut backport series 0.48.x
 - packages at /debian-argonaut

We'll need to update the parallel branches in teuthology.git, 
ceph-qa-suite.git, and s3-tests.git to match.


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: branches
  2013-01-08 18:39 branches Sage Weil
@ 2013-01-08 18:48 ` Mark Nelson
  2013-01-18 18:32 ` branches Sage Weil
  1 sibling, 0 replies; 6+ messages in thread
From: Mark Nelson @ 2013-01-08 18:48 UTC (permalink / raw)
  To: Sage Weil; +Cc: ceph-devel

On 01/08/2013 12:39 PM, Sage Weil wrote:
> I'd like to adjust the branches we're maintaining in ceph.git.  Currently:
>
> master
>   - active development
> next
>   - frozen for next release
>   - bug fixes only
>   - regularly merged back into master
> testing
>   - last development release
>   - cherry-pick -x'd critical fixes
>   - packages at ceph.com/debian-testing, /rpm-testing
> stable
>   - argonaut long-term backport series
>   - cherry-pick -x'd critical fixes
>   - packages at ceph.com/debian-argonaut, /debian
>
> The stable is ambiguous, and testing is a confusing name.  Instead, I
> propose:
>
> master  -- same
> next    -- same
> last
>   - last release (instead of 'testing')
>   - packages at /debian-testing and /debian-last, /rpm-testing, /rpm-last

I actually think I liked the testing name, but don't have a real strong 
opinion.

> bobtail
>   - bobtail backport series 0.56.x
>   - packages at /debian-bobtail (and /debian, until cuttlefish),
>     /rpm-bobtail, /rpm
> argonaut
>   - argonaut backport series 0.48.x
>   - packages at /debian-argonaut
>

Definitely yes.

> We'll need to update the parallel branches in teuthology.git,
> ceph-qa-suite.git, and s3-tests.git to match.
>
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: branches
  2013-01-08 18:39 branches Sage Weil
  2013-01-08 18:48 ` branches Mark Nelson
@ 2013-01-18 18:32 ` Sage Weil
  2013-01-18 19:02   ` branches Stefan Priebe
  1 sibling, 1 reply; 6+ messages in thread
From: Sage Weil @ 2013-01-18 18:32 UTC (permalink / raw)
  To: ceph-devel

I went ahead and made this change last week.

Just a remind, the new world order is:

> master
>  - active development
> next
>  - frozen for next release
>  - bug fixes only
>  - regularly merged back into master
> last
>  - last release (instead of 'testing')
>  - packages at /debian-testing and /debian-last, /rpm-testing, /rpm-last
> bobtail
>  - bobtail backport series 0.56.x
>  - packages at /debian-bobtail (and /debian, until cuttlefish), 
>    /rpm-bobtail, /rpm
> argonaut
>  - argonaut backport series 0.48.x
>  - packages at /debian-argonaut

sage

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: branches
  2013-01-18 18:32 ` branches Sage Weil
@ 2013-01-18 19:02   ` Stefan Priebe
  2013-01-18 19:36     ` branches Sage Weil
  0 siblings, 1 reply; 6+ messages in thread
From: Stefan Priebe @ 2013-01-18 19:02 UTC (permalink / raw)
  To: Sage Weil; +Cc: ceph-devel

Hi,

what's bobtail-next then? bobtail itself also contains already updates 
since 056.1?

Stefan

Am 18.01.2013 19:32, schrieb Sage Weil:
> I went ahead and made this change last week.
>
> Just a remind, the new world order is:
>
>> master
>>   - active development
>> next
>>   - frozen for next release
>>   - bug fixes only
>>   - regularly merged back into master
>> last
>>   - last release (instead of 'testing')
>>   - packages at /debian-testing and /debian-last, /rpm-testing, /rpm-last
>> bobtail
>>   - bobtail backport series 0.56.x
>>   - packages at /debian-bobtail (and /debian, until cuttlefish),
>>     /rpm-bobtail, /rpm
>> argonaut
>>   - argonaut backport series 0.48.x
>>   - packages at /debian-argonaut
>
> sage
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: branches
  2013-01-18 19:02   ` branches Stefan Priebe
@ 2013-01-18 19:36     ` Sage Weil
  2013-01-18 21:06       ` branches Nick Couchman
  0 siblings, 1 reply; 6+ messages in thread
From: Sage Weil @ 2013-01-18 19:36 UTC (permalink / raw)
  To: Stefan Priebe; +Cc: ceph-devel

On Fri, 18 Jan 2013, Stefan Priebe wrote:
> Hi,
> 
> what's bobtail-next then? bobtail itself also contains already updates since
> 056.1?

Just a few backported things I wanted a few eyeballs on before I put it in 
bobtail.

Generally speaking, the bobtail and argonaut branches are safe to run 
directly.  The caveat is they haven't been hammered in their final form by 
the nightly qa runs yet.

sage


> 
> Stefan
> 
> Am 18.01.2013 19:32, schrieb Sage Weil:
> > I went ahead and made this change last week.
> > 
> > Just a remind, the new world order is:
> > 
> > > master
> > >   - active development
> > > next
> > >   - frozen for next release
> > >   - bug fixes only
> > >   - regularly merged back into master
> > > last
> > >   - last release (instead of 'testing')
> > >   - packages at /debian-testing and /debian-last, /rpm-testing, /rpm-last
> > > bobtail
> > >   - bobtail backport series 0.56.x
> > >   - packages at /debian-bobtail (and /debian, until cuttlefish),
> > >     /rpm-bobtail, /rpm
> > > argonaut
> > >   - argonaut backport series 0.48.x
> > >   - packages at /debian-argonaut
> > 
> > sage
> > --
> > To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> > 
> 
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: branches
  2013-01-18 19:36     ` branches Sage Weil
@ 2013-01-18 21:06       ` Nick Couchman
  0 siblings, 0 replies; 6+ messages in thread
From: Nick Couchman @ 2013-01-18 21:06 UTC (permalink / raw)
  To: Sage Weil, Stefan Priebe; +Cc: ceph-devel

>>> On 2013/01/18 at 12:36, Sage Weil <sage@inktank.com> wrote: 
> On Fri, 18 Jan 2013, Stefan Priebe wrote:
>> Hi,
>> 
>> what's bobtail-next then? bobtail itself also contains already updates since
>> 056.1?
> 
> Just a few backported things I wanted a few eyeballs on before I put it in 
> bobtail.
> 
> Generally speaking, the bobtail and argonaut branches are safe to run 
> directly.  The caveat is they haven't been hammered in their final form by 
> the nightly qa runs yet.
> 
> sage
> 
> 

So, sorry for the probably stupid question, but is argonaut still considered the "stable" branch, or is that bobtail, now?

-Nick



--------

This e-mail may contain confidential and privileged material for the sole use of the intended recipient.  If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information.  In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way.  If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox.  Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2013-01-18 21:06 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-08 18:39 branches Sage Weil
2013-01-08 18:48 ` branches Mark Nelson
2013-01-18 18:32 ` branches Sage Weil
2013-01-18 19:02   ` branches Stefan Priebe
2013-01-18 19:36     ` branches Sage Weil
2013-01-18 21:06       ` branches Nick Couchman

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.