Merge branch '2017.7' into boto_lc

doc/topics/releases/2017.7.2.rst

@@ -16,6 +16,11 @@ CVE-2017-14696 Remote Denial of Service with a specially crafted authentication
 
 Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs):
 
+Known Issues
+============
+
+On 2017.7.2 when using salt-api and cherrypy version 5.6.0, issue `#43581`_ will occur when starting the salt-api service. We have patched the cherry-py packages for python-cherrypy-5.6.0-2 from repo.saltstack.com. If you are using python-cherrypy-5.6.0-1 please ensure to run `yum install python-cherrypy` to install the new patched version.
+
 *Generated at: 2017-09-26T21:06:19Z*
 
 Statistics:
@@ -3104,6 +3109,7 @@ Changes:
 .. _`#475`: https://github.com/saltstack/salt/issues/475
 .. _`#480`: https://github.com/saltstack/salt/issues/480
 .. _`#495`: https://github.com/saltstack/salt/issues/495
+.. _`#43581`: https://github.com/saltstack/salt/issues/43581
 .. _`bp-37424`: https://github.com/saltstack/salt/pull/37424
 .. _`bp-39366`: https://github.com/saltstack/salt/pull/39366
 .. _`bp-41543`: https://github.com/saltstack/salt/pull/41543

salt/states/win_dacl.py

@@ -33,7 +33,7 @@ Ensure an ACL does not exist
 
     .. code-block:: yaml
 
-    removeAcl:
+        removeAcl:
           win_dacl.absent:
             - name: HKEY_LOCAL_MACHINE\\SOFTWARE\\mykey
             - objectType: Registry
@@ -50,11 +50,11 @@ Ensure an object is inheriting permissions
 
     .. code-block:: yaml
 
-    eInherit:
-      win_dacl.enableinheritance:
-        - name: HKEY_LOCAL_MACHINE\\SOFTWARE\\mykey
-        - objectType: Registry
-        - clear_existing_acl: True
+        eInherit:
+          win_dacl.enableinheritance:
+            - name: HKEY_LOCAL_MACHINE\\SOFTWARE\\mykey
+            - objectType: Registry
+            - clear_existing_acl: True
 
 Ensure an object is not inheriting permissions
     parameters:
@@ -62,13 +62,13 @@ Ensure an object is not inheriting permissions
         objectType - Registry/File/Directory
         copy_inherited_acl - True/False - if inheritance is enabled, should the inherited permissions be copied to the ACL when inheritance is disabled
 
-        .. code-block:: yaml
+    .. code-block:: yaml
 
-    dInherit:
-      win_dacl.disableinheritance:
-        - name: HKEY_LOCAL_MACHINE\\SOFTWARE\\mykey
-        - objectType: Registry
-        - copy_inherited_acl: False
+        dInherit:
+          win_dacl.disableinheritance:
+            - name: HKEY_LOCAL_MACHINE\\SOFTWARE\\mykey
+            - objectType: Registry
+            - copy_inherited_acl: False
 '''
 
 
@@ -119,7 +119,7 @@ def present(name, objectType, user, permission, acetype, propagation):
 
 def absent(name, objectType, user, permission, acetype, propagation):
     '''
-    Ensure a Linux ACL does not exist
+    Ensure an ACL does not exist
     '''
     ret = {'name': name,
            'result': True,