gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-02 07:03:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

doc: clarify SubmittingPatches.rst

Browse Source 
This commit clarifies that folks opening bugfix PRs that need backporting to
one or more stable branches should always target master, and that the
backporting itself takes place only after the master PR is merged.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
This commit is contained in:
Nathan Cutler 2017-01-18 22:17:49 +01:00
parent a18c7e1239
commit 736b8039f5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SubmittingPatches.rst
View File

@ -299,10 +299,13 @@ A: The target branch depends on the nature of your change:
branches (for example, the "hammer" or "infernalis" branches), then you
should file a Redmine ticket describing your issue and fill out the
"Backport: <branchname>" form field. This will notify other developers that
your commit should be cherry-picked to these stable branches. For example,
you should set "Backport: hammer" in your Redmine ticket to indicate that
you are fixing a bug that exists on the "hammer" branch and that you
desire that your change be cherry-picked to that branch.
your commit should be cherry-picked to one or more stable branches. Then,
target the "master" branch in your pull request.
For example, you should set "Backport: jewel, kraken" in your Redmine ticket
to indicate that you are fixing a bug that exists on the "jewel" and
"kraken" branches and that you desire that your change be cherry-picked to
those branches after it is merged into master.
Q: How to include ``Reviewed-by: tag(s)`` in my pull request?