Merge "make the docs for drivefixes match the code"

This commit is contained in:
Jenkins 2017-06-06 23:13:13 +00:00 committed by Gerrit Code Review
commit 4228a705bd

View File

@ -421,8 +421,8 @@ Each ``branch`` entry is a mapping with keys:
already in the target repository. already in the target repository.
If a branch name starts with driverfixes/ then the location must be If a branch name starts with driverfixes/ then the location must be
a SHA of a commit already in the target repository on the associated a mapping between the target repository name and the SHA of a commit
stable branch. already in the target repository on the associated stable branch.
Examples Examples
@ -466,6 +466,41 @@ and then for the subsequent release it would be updated to contain::
This release includes the change to stop importing This release includes the change to stop importing
from the 'oslo' namespace package. from the 'oslo' namespace package.
A driverfixes branch might be added to a project in a similar
way. This example shows the branch created in cinder for the newton
series. The branch was created from the HEAD of the stable/newton
branch at the time.
::
---
launchpad: cinder
team: cinder
type: service
release-model: cycle-with-milestones
release-notes: https://docs.openstack.org/releasenotes/cinder/newton.html
branches:
- name: stable/newton
location: 9.0.0.0rc1
- name: driverfixes/newton
location:
openstack/cinder: 08bfc7d817f313451e619b535299121b686d7bd8
releases:
# ...
- version: 9.0.0.0rc1
projects:
- repo: openstack/cinder
hash: 0ba267fbc1836722735102994b466ecd7803b10a
- version: 9.0.0.0rc2
projects:
- repo: openstack/cinder
hash: ab9518112137f3141739e873b19cdc0085963bc7
# ...
- version: 9.1.4
projects:
- repo: openstack/cinder
hash: 908def6bb993798146cccc1621a9cee18950629d
For deliverables with multiple repositories, the list of projects For deliverables with multiple repositories, the list of projects
would contain all of them. For example, the Neutron deliverable might would contain all of them. For example, the Neutron deliverable might
be described by ``deliverables/mitaka/neutron.yaml`` containing: be described by ``deliverables/mitaka/neutron.yaml`` containing: