1
0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-23 17:33:56 +03:00

Add OpenNebula git flow rules

(cherry picked from commit 7f74f94858)
This commit is contained in:
Tino Vazquez 2019-02-28 15:25:51 +01:00
parent 4ea69dabeb
commit 8cd2343b86
No known key found for this signature in database
GPG Key ID: 2FE9C32E94AEABBE

View File

@ -0,0 +1,22 @@
Each project has it's own way of doing things. The following simple rules capture the OpenNebula dev team gitflow. Comments are welcome (contact@opennebula.org)!
OpenNebula branches
===================
master: latest development version (stable... to some extent)
one-X.Y: stable version (only bug fixing). No etc file changes. No migrator changes
feature-Z or bug-Z: to develop Z
New features are committed/merged to master
Bug fixing are committed/merged to master and cherry-picked to the currently active (ie, latest release) one-X.Y
Documentation
=============
master: Docs for latest development
one-X.Y: Docs for stable, automatically published
one-X.Y-maintenance: Docs for next stable release (one-X.Y.+1)
New features are documented on master and added to the What's New guide
Bugs are documented on master and cherry-picked one-X.Y-maintenance. Also, added to one-X.Y.maintenance Resolved Issues X.Y+1
Documentation bugs are committed to master and cherry-picked to one-X.Y (no need to port it to one-X.Y-maintenance)