753066eeee
It was intended that this be moved to the archive since we haven't used it in the latest training. We cover some discussion of stable branches elsewhere so it's not necessary to have a whole slide deck in the agenda that we don't cover anyway. Change-Id: I38d70709e8cd36688bc2a55741263d093f4b3e47
57 lines
906 B
ReStructuredText
57 lines
906 B
ReStructuredText
===============
|
|
Branching model
|
|
===============
|
|
|
|
.. image:: ./_assets/os_background.png
|
|
:class: fill
|
|
:width: 100%
|
|
|
|
nvie inspired
|
|
=============
|
|
|
|
.. image:: ./_assets/15-01-inspired.png
|
|
|
|
Stable branches
|
|
===============
|
|
|
|
.. image:: ./_assets/15-02-stable-branches.png
|
|
|
|
Appropriate Fixes
|
|
=================
|
|
|
|
- risk of regression
|
|
- user visible benefit
|
|
- Self-contained
|
|
- fix is already on master
|
|
|
|
Forbidden
|
|
=========
|
|
|
|
- New features
|
|
- Changes to the external HTTP APIs
|
|
- Changes to Nova's internal AMQP API
|
|
- Changes to the notification definitions
|
|
- DB schema changes
|
|
- Incompatible config file changes
|
|
|
|
2013.2 branch and tags
|
|
======================
|
|
|
|
.. image:: ./_assets/15-03-branch-tags.png
|
|
|
|
2013.2.4 preparation
|
|
====================
|
|
|
|
.. image:: ./_assets/15-04-preparation.png
|
|
|
|
Review
|
|
======
|
|
|
|
.. image:: ./_assets/15-05-review.png
|
|
:width: 100%
|
|
|
|
Exercise
|
|
========
|
|
|
|
checkout the latest stable branch
|