From 7f9258b024cdd134d2a26a4879f24ac04dfbdb07 Mon Sep 17 00:00:00 2001 From: Sandra McCann Date: Wed, 2 Sep 2020 12:53:48 -0400 Subject: [PATCH] update backport instructions for 2.11 (#71567) * update backport instructions in docs/docsite/rst/community/development_process.rst Co-authored-by: Matt Martz --- 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 7752b48df23..fc3c987ab09 100644 --- a/docs/docsite/rst/community/development_process.rst +++ b/docs/docsite/rst/community/development_process.rst @@ -206,7 +206,7 @@ Here are some examples: 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). -You can find more example changelog fragments in the `changelog directory `_ for the 2.9 release. +You can find more example changelog fragments in the `changelog directory `_ 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. @@ -223,7 +223,7 @@ We do **not** backport features. 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 ``git remote`` named ``upstream``. If you do not use a ``git remote`` named ``upstream``, adjust the instructions accordingly. @@ -236,7 +236,7 @@ We do **not** backport features. :: 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 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]`` - against the ``stable-2.9`` branch +#. Submit the pull request for ``backport/2.10/[PR_NUMBER_FROM_DEVEL]`` + against the ``stable-2.10`` 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 @@ -262,7 +262,7 @@ We do **not** backport features. .. 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 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