cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

update backport instructions for 2.11 (#71567)

Browse source 
* update backport instructions in docs/docsite/rst/community/development_process.rst

Co-authored-by: Matt Martz <matt@sivel.net>
This commit is contained in:
Sandra McCann 2020-09-02 12:53:48 -04:00 committed by GitHub
parent 64e2b9da3b
commit 7f9258b024
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
docs/docsite/rst/community/development_process.rst
View file

@ -206,7 +206,7 @@ Here are some examples:
remote_src=True even if mode was not set as a parameter. This failed on remote_src=True even if mode was not set as a parameter. This failed on
filesystems which do not have permission bits (https://github.com/ansible/ansible/issues/29444). filesystems which do not have permission bits (https://github.com/ansible/ansible/issues/29444).
You can find more example changelog fragments in the `changelog directory <https://github.com/ansible/ansible/tree/stable-2.9/changelogs/fragments>`_ for the 2.9 release. You can find more example changelog fragments in the `changelog directory <https://github.com/ansible/ansible/tree/stable-2.10/changelogs/fragments>`_ for the 2.10 release.
After you have written the changelog fragment for your PR, commit the file and include it with the pull request. After you have written the changelog fragment for your PR, commit the file and include it with the pull request.
@ -223,7 +223,7 @@ We do **not** backport features.
These instructions assume that: These instructions assume that:
* ``stable-2.9`` is the targeted release branch for the backport * ``stable-2.10`` is the targeted release branch for the backport
* ``https://github.com/ansible/ansible.git`` is configured as a * ``https://github.com/ansible/ansible.git`` is configured as a
``git remote`` named ``upstream``. If you do not use ``git remote`` named ``upstream``. If you do not use
a ``git remote`` named ``upstream``, adjust the instructions accordingly. a ``git remote`` named ``upstream``, adjust the instructions accordingly.
@ -236,7 +236,7 @@ We do **not** backport features.
:: ::
git fetch upstream git fetch upstream
git checkout -b backport/2.9/[PR_NUMBER_FROM_DEVEL] upstream/stable-2.9 git checkout -b backport/2.10/[PR_NUMBER_FROM_DEVEL] upstream/stable-2.10
#. Cherry pick the relevant commit SHA from the devel branch into your feature #. Cherry pick the relevant commit SHA from the devel branch into your feature
branch, handling merge conflicts as necessary: branch, handling merge conflicts as necessary:
@ -251,10 +251,10 @@ We do **not** backport features.
:: ::
git push origin backport/2.9/[PR_NUMBER_FROM_DEVEL] git push origin backport/2.10/[PR_NUMBER_FROM_DEVEL]
#. Submit the pull request for ``backport/2.9/[PR_NUMBER_FROM_DEVEL]`` #. Submit the pull request for ``backport/2.10/[PR_NUMBER_FROM_DEVEL]``
against the ``stable-2.9`` branch against the ``stable-2.10`` branch
#. The Release Manager will decide whether to merge the backport PR before #. The Release Manager will decide whether to merge the backport PR before
the next minor release. There isn't any need to follow up. Just ensure that the automated the next minor release. There isn't any need to follow up. Just ensure that the automated
@ -262,7 +262,7 @@ We do **not** backport features.
.. note:: .. note::
The choice to use ``backport/2.9/[PR_NUMBER_FROM_DEVEL]`` as the The choice to use ``backport/2.10/[PR_NUMBER_FROM_DEVEL]`` as the
name for the feature branch is somewhat arbitrary, but conveys meaning name for the feature branch is somewhat arbitrary, but conveys meaning
about the purpose of that branch. It is not required to use this format, about the purpose of that branch. It is not required to use this format,
but it can be helpful, especially when making multiple backport PRs for but it can be helpful, especially when making multiple backport PRs for