From f264e9cfca533af97bcc747c4a67da79ed43f0a7 Mon Sep 17 00:00:00 2001 From: Sandra McCann Date: Thu, 31 Oct 2019 20:49:17 -0400 Subject: [PATCH] update backport instructions to use stable-2.9 (#64168) --- docs/docsite/rst/community/development_process.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/docsite/rst/community/development_process.rst b/docs/docsite/rst/community/development_process.rst index d2630377f7e..efab91bad00 100644 --- a/docs/docsite/rst/community/development_process.rst +++ b/docs/docsite/rst/community/development_process.rst @@ -18,7 +18,7 @@ If you want to follow the conversation about what features will be added to Ansi * the :ref:`Ansible Release Schedule ` * various GitHub `projects `_ - for example: - * the `2.8 release project `_ + * the `2.10 release project `_ * the `network bugs project `_ * the `core documentation project `_ @@ -225,7 +225,7 @@ We do **not** backport features. 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 ``git remote`` named ``upstream``. If you do not use a ``git remote`` named ``upstream``, adjust the instructions accordingly. @@ -238,7 +238,7 @@ We do **not** backport features. :: 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 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]`` - against the ``stable-2.8`` branch +#. Submit the pull request for ``backport/2.9/[PR_NUMBER_FROM_DEVEL]`` + against the ``stable-2.9`` 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 @@ -264,7 +264,7 @@ We do **not** backport features. .. 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 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