diff options
| author | Sandra McCann <samccann@redhat.com> | 2023-02-02 19:08:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-02 16:08:14 -0800 |
| commit | 2420ff280b34898e2ce85d128debf51df57c5572 (patch) | |
| tree | 40edcd7fdaaed18c86160df2ad5f066afe166906 /lib | |
| parent | 6daf33b571f9ef9466b167424b3803d453f11b15 (diff) | |
| download | ansible-2420ff280b34898e2ce85d128debf51df57c5572.tar.gz | |
Backportapalooza 02 02 (#79890)
* [Docs] add easyfix/good first issue/docs links (#79830)
(cherry picked from commit 722fc05c3112c4dfe675331a2f88f5a10a875187)
* [Docs] add doc links to documentation_contributions.rst (#79840)
(cherry picked from commit 58f0950638341f3966d4f72395acdaeece3493ba)
* Remove dev_guide stubs (#79795)
* Remove dev_guide stubs
* Remove Cisco ACI Dev Guide
(cherry picked from commit 10f0e5f6d4f1f65a02603c296ccf7fa0f7b48752)
* maintainers_guidelines.rst: add a link to collection release guidelines (#79859)
(cherry picked from commit fa382670dc35d89652c03c3d7f7911533a36b29d)
* Mentions 'meta: flush_handlers' task (#79542)
(cherry picked from commit d8dc76e134fa458690acbd70f0cb9a009dbb5e29)
* Description for changing User ID to match user value (#79470)
(cherry picked from commit 913e4863afe44b516e03906868cec7b38f3d2802)
* Remove irrelevant line (#79865)
Remove irrelevant comment line form example code
(cherry picked from commit 1c01eab3fb53c599552172244c19cea1e59cb0cf)
---------
Co-authored-by: Andrew Klychkov <aaklychkov@mail.ru>
Co-authored-by: Mario Lenz <m@riolenz.de>
Co-authored-by: Andrew Klychkov <aklychko@redhat.com>
Co-authored-by: JaroslavKlech <klechh@gmail.com>
Co-authored-by: Tabah Baridule M <dulemartins07@gmail.com>
Co-authored-by: Konrad Gawda <konrad.gawda.opensource@gmail.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ansible/plugins/doc_fragments/files.py | 2 | ||||
| -rw-r--r-- | lib/ansible/plugins/filter/combine.yml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/ansible/plugins/doc_fragments/files.py b/lib/ansible/plugins/doc_fragments/files.py index 2356bd72ce..b87fd11d10 100644 --- a/lib/ansible/plugins/doc_fragments/files.py +++ b/lib/ansible/plugins/doc_fragments/files.py @@ -36,6 +36,8 @@ options: - Name of the user that should own the filesystem object, as would be fed to I(chown). - When left unspecified, it uses the current user unless you are root, in which case it can preserve the previous ownership. + - Specifying a numeric username will be assumed to be a user ID and not a username. Avoid numeric usernames to avoid this confusion. + type: str group: description: diff --git a/lib/ansible/plugins/filter/combine.yml b/lib/ansible/plugins/filter/combine.yml index f2f4371839..86788f3107 100644 --- a/lib/ansible/plugins/filter/combine.yml +++ b/lib/ansible/plugins/filter/combine.yml @@ -36,7 +36,6 @@ EXAMPLES: | # ab => {'a':1, 'b':3, 'c': 4} ab: {{ {'a':1, 'b':2} | combine({'b':3, 'c':4}) }} - # ab => {'a':1, 'b':3, 'c': 4} many: "{{ dict1 | combine(dict2, dict3, dict4) }}" RETURN: |