|
|
@ -18,7 +18,7 @@ If you want to follow the conversation about what features will be added to Ansi
|
|
|
|
* the :ref:`Ansible Release Schedule <release_and_maintenance>`
|
|
|
|
* the :ref:`Ansible Release Schedule <release_and_maintenance>`
|
|
|
|
* various GitHub `projects <https://github.com/ansible/ansible/projects>`_ - for example:
|
|
|
|
* various GitHub `projects <https://github.com/ansible/ansible/projects>`_ - for example:
|
|
|
|
|
|
|
|
|
|
|
|
* the `2.8 release project <https://github.com/ansible/ansible/projects/30>`_
|
|
|
|
* the `2.10 release project <https://github.com/ansible/ansible/projects/39>`_
|
|
|
|
* the `network bugs project <https://github.com/ansible/ansible/projects/20>`_
|
|
|
|
* the `network bugs project <https://github.com/ansible/ansible/projects/20>`_
|
|
|
|
* the `core documentation project <https://github.com/ansible/ansible/projects/27>`_
|
|
|
|
* the `core documentation project <https://github.com/ansible/ansible/projects/27>`_
|
|
|
|
|
|
|
|
|
|
|
@ -225,7 +225,7 @@ We do **not** backport features.
|
|
|
|
|
|
|
|
|
|
|
|
These instructions assume that:
|
|
|
|
These instructions assume that:
|
|
|
|
|
|
|
|
|
|
|
|
* ``stable-2.8`` is the targeted release branch for the backport
|
|
|
|
* ``stable-2.9`` 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.
|
|
|
@ -238,7 +238,7 @@ We do **not** backport features.
|
|
|
|
::
|
|
|
|
::
|
|
|
|
|
|
|
|
|
|
|
|
git fetch upstream
|
|
|
|
git fetch upstream
|
|
|
|
git checkout -b backport/2.8/[PR_NUMBER_FROM_DEVEL] upstream/stable-2.8
|
|
|
|
git checkout -b backport/2.9/[PR_NUMBER_FROM_DEVEL] upstream/stable-2.9
|
|
|
|
|
|
|
|
|
|
|
|
#. 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:
|
|
|
@ -253,10 +253,10 @@ We do **not** backport features.
|
|
|
|
|
|
|
|
|
|
|
|
::
|
|
|
|
::
|
|
|
|
|
|
|
|
|
|
|
|
git push origin backport/2.8/[PR_NUMBER_FROM_DEVEL]
|
|
|
|
git push origin backport/2.9/[PR_NUMBER_FROM_DEVEL]
|
|
|
|
|
|
|
|
|
|
|
|
#. Submit the pull request for ``backport/2.8/[PR_NUMBER_FROM_DEVEL]``
|
|
|
|
#. Submit the pull request for ``backport/2.9/[PR_NUMBER_FROM_DEVEL]``
|
|
|
|
against the ``stable-2.8`` branch
|
|
|
|
against the ``stable-2.9`` 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
|
|
|
@ -264,7 +264,7 @@ We do **not** backport features.
|
|
|
|
|
|
|
|
|
|
|
|
.. note::
|
|
|
|
.. note::
|
|
|
|
|
|
|
|
|
|
|
|
The choice to use ``backport/2.8/[PR_NUMBER_FROM_DEVEL]`` as the
|
|
|
|
The choice to use ``backport/2.9/[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
|
|
|
|