diff options
| author | Michael DeHaan <michael.dehaan@gmail.com> | 2014-08-08 13:28:45 -0400 |
|---|---|---|
| committer | Michael DeHaan <michael.dehaan@gmail.com> | 2014-08-08 13:28:45 -0400 |
| commit | 185d5a6221855393463a9b1cf865bf502637256e (patch) | |
| tree | eb1a6d53719f026e22735914b5b0bf3bc29909c7 /files | |
| parent | 51ab48bf71cee028b15156e687967fbc49f926ce (diff) | |
| parent | 4dcaa9d9fbe7c00d32c44a0124544d453e1505ba (diff) | |
| download | ansible-modules-extras-185d5a6221855393463a9b1cf865bf502637256e.tar.gz | |
Merge branch 'spelling' of git://github.com/cgar/ansible into devel
Conflicts:
docsite/rst/guide_rax.rst
plugins/callbacks/mail.py
Diffstat (limited to 'files')
| -rw-r--r-- | files/acl | 2 | ||||
| -rw-r--r-- | files/xattr | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -77,7 +77,7 @@ options: required: false default: null description: - - DEPRECATED. The acl to set or remove. This must always be quoted in the form of '<etype>:<qualifier>:<perms>'. The qualifier may be empty for some types, but the type and perms are always requried. '-' can be used as placeholder when you do not care about permissions. This is now superceeded by entity, type and permissions fields. + - DEPRECATED. The acl to set or remove. This must always be quoted in the form of '<etype>:<qualifier>:<perms>'. The qualifier may be empty for some types, but the type and perms are always requried. '-' can be used as placeholder when you do not care about permissions. This is now superseded by entity, type and permissions fields. author: Brian Coca notes: diff --git a/files/xattr b/files/xattr index 25179e3c..94115ae3 100644 --- a/files/xattr +++ b/files/xattr @@ -165,7 +165,7 @@ def main(): res = {} if key is None and state in ['present','absent']: - module.fail_json(msg="%s needs a key paramter" % state) + module.fail_json(msg="%s needs a key parameter" % state) # All xattr must begin in user namespace if key is not None and not re.match('^user\.',key): |