Merge branch '2017.7' into improve-async-operation-handling-in-kubernetes-module

This commit is contained in:
Mike Place 2017-09-19 18:15:07 -06:00 committed by GitHub
commit 3b1cb884b9

View file

@ -49,7 +49,7 @@ def __virtual__():
if salt.utils.which('getfacl') and salt.utils.which('setfacl'):
return __virtualname__
return False
return False, 'The linux_acl state cannot be loaded: the getfacl or setfacl binary is not in the path.'
def present(name, acl_type, acl_name='', perms='', recurse=False):