From 6e2b336a880b3d31a807a2be69a317b0c8055f86 Mon Sep 17 00:00:00 2001 From: Kevin Breit Date: Fri, 17 May 2019 08:30:59 -0500 Subject: [PATCH] Move backport guide to 2.8 ##### SUMMARY The backport guide now refers to Ansible 2.8 instead of 2.7 since 2.8 is out. ##### ISSUE TYPE - Docs Pull Request +label: docsite_pr --- docs/docsite/rst/community/development_process.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/docsite/rst/community/development_process.rst b/docs/docsite/rst/community/development_process.rst index 9d636a8794544b..e02ae9f4fa64c4 100644 --- a/docs/docsite/rst/community/development_process.rst +++ b/docs/docsite/rst/community/development_process.rst @@ -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. @@ -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: @@ -253,10 +253,10 @@ 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 @@ -264,7 +264,7 @@ We do **not** backport features. .. 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