Merge pull request #40025 from rallytime/merge-2016.11

[2016.11] Merge forward from 2016.3 to 2016.11

salt/modules/cmdmod.py

@@ -752,10 +752,10 @@ def run(cmd,
 
     :param str stdin: A string of standard input can be specified for the
       command to be run using the ``stdin`` parameter. This can be useful in cases
-      where sensitive information must be read from standard input.:
+      where sensitive information must be read from standard input.
 
     :param str runas: User to run script as. If running on a Windows minion you
-      must also pass a password
+      must also pass a password.
 
     :param str password: Windows only. Required when specifying ``runas``. This
       parameter will be ignored on non-Windows platforms.
@@ -765,10 +765,14 @@ def run(cmd,
     :param str shell: Shell to execute under. Defaults to the system default
       shell.
 
-    :param bool python_shell: If False, let python handle the positional
+    :param bool python_shell: If ``False``, let python handle the positional
-      arguments. Set to True to use shell features, such as pipes or redirection
+      arguments. Set to ``True`` to use shell features, such as pipes or
+      redirection.
 
-    :param bool bg: If True, run command in background and do not await or deliver it's results
+    :param bool bg: If ``True``, run command in background and do not await or
+      deliver it's results
+
+      .. versionadded:: 2016.3.0
 
     :param list env: A list of environment variables to be set prior to
       execution.
@@ -1593,14 +1597,23 @@ def run_all(cmd,
       ``env`` represents the environment variables for the command, and
       should be formatted as a dict, or a YAML string which resolves to a dict.
 
-    redirect_stderr : False
+    :param bool redirect_stderr: If set to ``True``, then stderr will be
-        If set to ``True``, then stderr will be redirected to stdout. This is
+      redirected to stdout. This is helpful for cases where obtaining both the
-        helpful for cases where obtaining both the retcode and output is
+      retcode and output is desired, but it is not desired to have the output
-        desired, but it is not desired to have the output separated into both
+      separated into both stdout and stderr.
-        stdout and stderr.
 
         .. versionadded:: 2015.8.2
 
+    :param str password: Windows only. Required when specifying ``runas``. This
+      parameter will be ignored on non-Windows platforms.
+
+      .. versionadded:: 2016.3.0
+
+    :param bool bg: If ``True``, run command in background and do not await or
+      deliver it's results
+
+      .. versionadded:: 2016.3.6
+
     CLI Example:
 
     .. code-block:: bash

salt/modules/dockerng.py

@@ -813,6 +813,8 @@ def _get_client(timeout=None):
         - docker.url: URL to the docker service
         - docker.version: API version to use (default: "auto")
     '''
+    # In some edge cases, the client instance is missing attributes. Don't use
+    # the cached client in those cases.
     if 'docker.client' not in __context__ \
             or not hasattr(__context__['docker.client'], 'timeout'):
         client_kwargs = {}

salt/states/cmd.py

@@ -757,6 +757,12 @@ def run(name,
         interactively to the console and the logs.
         This is experimental.
 
+    bg
+        If ``True``, run command in background and do not await or deliver it's
+        results.
+
+        .. versionadded:: 2016.3.6
+
     .. note::
 
         cmd.run supports the usage of ``reload_modules``. This functionality
@@ -777,10 +783,10 @@ def run(name,
                 - reload_modules: True
 
     '''
-    ### NOTE: The keyword arguments in **kwargs are ignored in this state, but
+    ### NOTE: The keyword arguments in **kwargs are passed directly to the
-    ###       cannot be removed from the function definition, otherwise the use
+    ###       ``cmd.run_all`` function and cannot be removed from the function
-    ###       of unsupported arguments in a cmd.run state will result in a
+    ###       definition, otherwise the use of unsupported arguments in a
-    ###       traceback.
+    ###       ``cmd.run`` state will result in a traceback.
 
     test_name = None
     if not isinstance(stateful, list):

salt/states/dockerng.py

@@ -1530,6 +1530,8 @@ def running(name,
         the format ``<ulimit_name>:<soft_limit>:<hard_limit>``, with the hard
         limit being optional.
 
+        .. versionadded:: 2016.3.6,2016.11.4,Nitrogen
+
         .. code-block:: yaml
 
             foo:
@@ -2449,7 +2451,7 @@ def volume_absent(name, driver=None):
     '''
     Ensure that a volume is absent.
 
-    .. versionadded:: 2015.8.4
+    .. versionadded:: 2015.8.4,
 
     name
         Name of the volume

tests/integration/modules/grains.py

@@ -152,9 +152,8 @@ class GrainsAppendTestCase(integration.ModuleCase):
     GRAIN_VAL = 'my-grain-val'
 
     def tearDown(self):
-        test_grain = self.run_function('grains.get', [self.GRAIN_KEY])
+        for item in self.run_function('grains.get', [self.GRAIN_KEY]):
-        if test_grain and test_grain == [self.GRAIN_VAL]:
+            self.run_function('grains.remove', [self.GRAIN_KEY, item])
-            self.run_function('grains.remove', [self.GRAIN_KEY, self.GRAIN_VAL])
 
     def test_grains_append(self):
         '''