diff options
author | Aine Riordan <44700011+ariordan-redhat@users.noreply.github.com> | 2021-11-05 06:20:16 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-05 08:20:16 -0500 |
commit | 99f694bfb7fbdf13c5b3c1222a7359fc2bbba665 (patch) | |
tree | 8b4b0f5a7ed5eda1e74391348d78438b136dc91d | |
parent | 227da1ccc5a8bc3201993c1aab63666b1cf5bc54 (diff) | |
download | ansible-99f694bfb7fbdf13c5b3c1222a7359fc2bbba665.tar.gz |
[Backport][Docs] Docs 2.12 backportapalooza6 (#76231)
* Fix broken M() refs. (#76202)
* update backport instructions for 2.12 (#76209)
* Update dev guide for vars plugins in collections (#75861)
Co-authored-by: Felix Fontein <felix@fontein.de>
Co-authored-by: Sandra McCann <samccann@redhat.com>
Co-authored-by: Sebastian Wiesinger <sebastian@karotte.org>
-rw-r--r-- | docs/docsite/rst/community/development_process.rst | 12 | ||||
-rw-r--r-- | docs/docsite/rst/dev_guide/developing_plugins.rst | 2 | ||||
-rw-r--r-- | lib/ansible/modules/dnf.py | 2 | ||||
-rw-r--r-- | lib/ansible/modules/yum.py | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/docs/docsite/rst/community/development_process.rst b/docs/docsite/rst/community/development_process.rst index 12d0d419cd..88610c49f6 100644 --- a/docs/docsite/rst/community/development_process.rst +++ b/docs/docsite/rst/community/development_process.rst @@ -243,7 +243,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 <https://github.com/ansible/ansible/tree/stable-2.11/changelogs/fragments>`_ for the 2.11 release. +You can find more example changelog fragments in the `changelog directory <https://github.com/ansible/ansible/tree/stable-2.12/changelogs/fragments>`_ for the 2.12 release. After you have written the changelog fragment for your PR, commit the file and include it with the pull request. @@ -307,7 +307,7 @@ We do **not** backport features. These instructions assume that: - * ``stable-2.11`` is the targeted release branch for the backport + * ``stable-2.12`` 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. * ``https://github.com/<yourgithubaccount>/ansible.git`` is configured as a ``git remote`` named ``origin``. If you do not use a ``git remote`` named ``origin``, adjust the instructions accordingly. @@ -316,7 +316,7 @@ We do **not** backport features. .. code-block:: shell git fetch upstream - git checkout -b backport/2.11/[PR_NUMBER_FROM_DEVEL] upstream/stable-2.11 + git checkout -b backport/2.12/[PR_NUMBER_FROM_DEVEL] upstream/stable-2.12 #. Cherry pick the relevant commit SHA from the devel branch into your feature branch, handling merge conflicts as necessary: @@ -330,15 +330,15 @@ We do **not** backport features. .. code-block:: shell - git push origin backport/2.11/[PR_NUMBER_FROM_DEVEL] + git push origin backport/2.12/[PR_NUMBER_FROM_DEVEL] -#. Submit the pull request for ``backport/2.11/[PR_NUMBER_FROM_DEVEL]`` against the ``stable-2.11`` branch +#. Submit the pull request for ``backport/2.12/[PR_NUMBER_FROM_DEVEL]`` against the ``stable-2.12`` 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 branch name ``backport/2.11/[PR_NUMBER_FROM_DEVEL]`` is somewhat arbitrary, but conveys meaning about the purpose of the branch. This branch name format is not required, but it can be helpful, especially when making multiple backport PRs for multiple stable branches. + The branch name ``backport/2.12/[PR_NUMBER_FROM_DEVEL]`` is somewhat arbitrary, but conveys meaning about the purpose of the branch. This branch name format is not required, but it can be helpful, especially when making multiple backport PRs for multiple stable branches. .. note:: diff --git a/docs/docsite/rst/dev_guide/developing_plugins.rst b/docs/docsite/rst/dev_guide/developing_plugins.rst index a18fe77ceb..e5998be42a 100644 --- a/docs/docsite/rst/dev_guide/developing_plugins.rst +++ b/docs/docsite/rst/dev_guide/developing_plugins.rst @@ -473,7 +473,7 @@ Vars plugins Vars plugins inject additional variable data into Ansible runs that did not come from an inventory source, playbook, or command line. Playbook constructs like 'host_vars' and 'group_vars' work using vars plugins. -Vars plugins were partially implemented in Ansible 2.0 and rewritten to be fully implemented starting with Ansible 2.4. Vars plugins are unsupported by collections. +Vars plugins were partially implemented in Ansible 2.0 and rewritten to be fully implemented starting with Ansible 2.4. Vars plugins are supported by collections starting with Ansible 2.10. Older plugins used a ``run`` method as their main body/work: diff --git a/lib/ansible/modules/dnf.py b/lib/ansible/modules/dnf.py index 83d2825789..943f2b2d93 100644 --- a/lib/ansible/modules/dnf.py +++ b/lib/ansible/modules/dnf.py @@ -242,7 +242,7 @@ extends_documentation_fragment: - action_common_attributes.flow attributes: action: - details: In the case of dnf, it has 2 action plugins that use it under the hood, M(yum) and M(package). + details: In the case of dnf, it has 2 action plugins that use it under the hood, M(ansible.builtin.yum) and M(ansible.builtin.package). support: partial async: support: none diff --git a/lib/ansible/modules/yum.py b/lib/ansible/modules/yum.py index c32a4b2efc..0b428e85e1 100644 --- a/lib/ansible/modules/yum.py +++ b/lib/ansible/modules/yum.py @@ -248,7 +248,7 @@ extends_documentation_fragment: - action_common_attributes.flow attributes: action: - details: In the case of yum, it has 2 action plugins that use it under the hood, M(yum) and M(package). + details: In the case of yum, it has 2 action plugins that use it under the hood, M(ansible.builtin.yum) and M(ansible.builtin.package). support: partial async: support: none |