Jump to: navigation, search

Difference between revisions of "Branch Model"

Line 7: Line 7:
  
 
At some point before the release of a milestone (called the "branch point"), the current state of ''trunk'' is merged into ''milestone-proposed'', and trunk continues towards the development of the next milestone. The ''milestone-proposed'' branches gets testing and bugfixes (that are also backported to ''trunk''), until the release is tagged.
 
At some point before the release of a milestone (called the "branch point"), the current state of ''trunk'' is merged into ''milestone-proposed'', and trunk continues towards the development of the next milestone. The ''milestone-proposed'' branches gets testing and bugfixes (that are also backported to ''trunk''), until the release is tagged.
 +
 +
Here are pointers to the branches:
 +
 +
{| border="1" cellpadding="2" cellspacing="0"
 +
|<#eeeeee>| Project
 +
|<#eeeeee>| ''trunk''
 +
|-
 +
|  Nova
 +
|  [https://code.launchpad.net/~hudson-openstack/nova/trunk lp:nova]
 +
|-
 +
|  Glance
 +
|  [https://code.launchpad.net/~hudson-openstack/glance/trunk lp:glance]
 +
|-
 +
|  Swift
 +
|  [https://code.launchpad.net/~hudson-openstack/swift/trunk lp:swift]

Revision as of 13:04, 1 June 2011

OpenStack branch model

Starting with the Diablo cycle, OpenStack core projects use a branching model close to the NVIE model that ensures a continuously-open trunk while still allowing to freeze features and select bugfixes in a release branch (milestone-proposed):

Template:Http://img97.imageshack.us/img97/8242/branchmodel.png

At some point before the release of a milestone (called the "branch point"), the current state of trunk is merged into milestone-proposed, and trunk continues towards the development of the next milestone. The milestone-proposed branches gets testing and bugfixes (that are also backported to trunk), until the release is tagged.

Here are pointers to the branches:

Project trunk
Nova lp:nova
Glance lp:glance
Swift lp:swift