summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Coca <bcoca@users.noreply.github.com>2019-01-16 16:54:01 -0500
committerMatt Clay <matt@mystile.com>2019-01-16 13:54:01 -0800
commit421a378022a4d7aa8f59839b8a15e051fb9b6e43 (patch)
tree438228fa14fc8c738ee0356597375490e0381c97
parentf9dcf40de59c433e4b7ed04b07e3d6467c6e243a (diff)
downloadansible-421a378022a4d7aa8f59839b8a15e051fb9b6e43.tar.gz
added missing docs for option in acl module (#50775) (#50806)
* added missing docs for option in acl module (#50775) * added missing docs for option in acl module * remove acl from ignore (cherry picked from commit 91d83838988d95822c23a578243d5ead4c493564)
-rw-r--r--changelogs/fragments/acl_doc_fix.yml2
-rw-r--r--lib/ansible/modules/files/acl.py12
-rw-r--r--test/sanity/validate-modules/ignore.txt2
3 files changed, 12 insertions, 4 deletions
diff --git a/changelogs/fragments/acl_doc_fix.yml b/changelogs/fragments/acl_doc_fix.yml
new file mode 100644
index 0000000000..de66ee3180
--- /dev/null
+++ b/changelogs/fragments/acl_doc_fix.yml
@@ -0,0 +1,2 @@
+bugfixes:
+ - document old option that was initally missed
diff --git a/lib/ansible/modules/files/acl.py b/lib/ansible/modules/files/acl.py
index d2441a0218..4bd48f5677 100644
--- a/lib/ansible/modules/files/acl.py
+++ b/lib/ansible/modules/files/acl.py
@@ -71,8 +71,16 @@ options:
description:
- Recursively sets the specified ACL (added in Ansible 2.0). Incompatible with C(state=query).
type: bool
- default: 'no'
- version_added: "2.0"
+ default: no
+ version_added: '2.0'
+
+ use_nfsv4_acls:
+ description:
+ - Use NFSv4 ACLs instead of POSIX ACLs.
+ type: bool
+ default: no
+ version_added: '2.2'
+
author:
- Brian Coca (@bcoca)
- Jérémie Astori (@astorije)
diff --git a/test/sanity/validate-modules/ignore.txt b/test/sanity/validate-modules/ignore.txt
index 16d29c1ad1..a211121b22 100644
--- a/test/sanity/validate-modules/ignore.txt
+++ b/test/sanity/validate-modules/ignore.txt
@@ -589,8 +589,6 @@ lib/ansible/modules/database/vertica/vertica_role.py E322
lib/ansible/modules/database/vertica/vertica_schema.py E322
lib/ansible/modules/database/vertica/vertica_user.py E322
lib/ansible/modules/database/vertica/vertica_user.py E325
-lib/ansible/modules/files/acl.py E322
-lib/ansible/modules/files/acl.py E325
lib/ansible/modules/files/assemble.py E323
lib/ansible/modules/files/assemble.py E324
lib/ansible/modules/files/blockinfile.py E324