Skip to content

Commit

Permalink
Move backport guide to 2.8 (ansible#56578)
Browse files Browse the repository at this point in the history
The backport guide should refer to Ansible 2.8 instead of 2.7 as the target branch, since 2.8 is out.
  • Loading branch information
kbreit authored and acozine committed May 18, 2019
1 parent 3f4a22d commit 4742897
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions docs/docsite/rst/community/development_process.rst
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ We do **not** backport features.

These instructions assume that:

* ``stable-2.7`` is the targeted release branch for the backport
* ``stable-2.8`` is the targeted release branch for the backport
* ``https://github.com/ansible/ansible.git`` is configured as a
``git remote`` named ``upstream``. If you do not use
a ``git remote`` named ``upstream``, adjust the instructions accordingly.
Expand All @@ -238,7 +238,7 @@ We do **not** backport features.
::

git fetch upstream
git checkout -b backport/2.7/[PR_NUMBER_FROM_DEVEL] upstream/stable-2.7
git checkout -b backport/2.8/[PR_NUMBER_FROM_DEVEL] upstream/stable-2.8

#. Cherry pick the relevant commit SHA from the devel branch into your feature
branch, handling merge conflicts as necessary:
Expand All @@ -253,18 +253,18 @@ We do **not** backport features.

::

git push origin backport/2.7/[PR_NUMBER_FROM_DEVEL]
git push origin backport/2.8/[PR_NUMBER_FROM_DEVEL]

#. Submit the pull request for ``backport/2.7/[PR_NUMBER_FROM_DEVEL]``
against the ``stable-2.7`` branch
#. Submit the pull request for ``backport/2.8/[PR_NUMBER_FROM_DEVEL]``
against the ``stable-2.8`` branch

#. 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
tests (CI) are green.

.. note::

The choice to use ``backport/2.7/[PR_NUMBER_FROM_DEVEL]`` as the
The choice to use ``backport/2.8/[PR_NUMBER_FROM_DEVEL]`` as the
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,
but it can be helpful, especially when making multiple backport PRs for
Expand Down

0 comments on commit 4742897

Please sign in to comment.