Re: master vs. next

[Loic Dachary <loic@dachary.org>]

[-- Attachment #1: Type: text/plain, Size: 1460 bytes --]



On 15/05/2015 11:48, Ilya Dryomov wrote:
> On Fri, May 15, 2015 at 11:44 AM, Nathan Cutler <ncutler@suse.cz> wrote:
>> I'm a newcomer to the ceph project. SubmittingPatches says to target
>> next for bugfixes and master for features. Beyond that I only have the
>> vaguest notion of what the next branch is for and how patches get moved
>> back and forth between master and next. Can anyone comment?
> 
> next is development release branch (while firefly, hammer, etc are
> stable release branches).  Bugfix PRs are submitted against next, next
> is periodically merged into master.  In fact anybody can merge next
> into master at any time to get the fix merged into next in master.
> (Not the other way around - fixes are not supposed to go into master and
> then be cherry-picked into next.)  After the development release is
> cut, next is reset to master.
> 
> I'm sure others will correct me if I missed something.

I've always targeted commits to master (although I should have used next instead). The only downside of doing that is that my commit will only be in the +2 development version, or is there another inconvenience ?

> 
> Thanks,
> 
>                 Ilya
> --
> 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
> 

-- 
Loïc Dachary, Artisan Logiciel Libre


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]