Merge pull request #29850 from basepi/merge-forward-2015.8

[2015.8] Merge forward from 2015.5 to 2015.8

salt/cloud/clouds/vmware.py

@@ -2985,6 +2985,9 @@ def create_snapshot(name, kwargs=None, call=None):
             '-a or --action.'
         )
 
+    if kwargs is None:
+        kwargs = {}
+
     snapshot_name = kwargs.get('snapshot_name') if kwargs and 'snapshot_name' in kwargs else None
 
     if not snapshot_name:
@@ -3055,6 +3058,9 @@ def revert_to_snapshot(name, kwargs=None, call=None):
             '-a or --action.'
         )
 
+    if kwargs is None:
+        kwargs = {}
+
     suppress_power_on = _str_to_bool(kwargs.get('power_off', False))
 
     vm_ref = salt.utils.vmware.get_mor_by_property(_get_si(), vim.VirtualMachine, name)

salt/modules/dockerio.py

@@ -29,12 +29,12 @@ Installation Prerequisites
   path that is running salt. Its version should support `Docker Remote API
   v1.12 <http://docs.docker.io/en/latest/reference/api/docker_remote_api_v1.12>`_.
 
-  Currently, ``docker-py 0.5.0`` is known to support `Docker Remote API v1.12
+  Currently, ``docker-py 0.6.0`` is known to support `Docker Remote API v1.12
   <http://docs.docker.io/en/latest/reference/api/docker_remote_api_v1.12>`_
 
   .. code-block:: bash
 
-      pip install docker-py==0.5.0
+      pip install docker-py==0.6.0
 
 Prerequisite Pillar Configuration for Authentication
 ----------------------------------------------------

salt/output/nested.py

@@ -90,17 +90,20 @@ class NestDisplay(object):
                 )
             )
         elif isinstance(ret, string_types):
+            first_line = True
             for line in ret.splitlines():
                 if self.strip_colors:
                     line = salt.output.strip_esc_sequence(line)
+                line_prefix = ' ' * len(prefix) if not first_line else prefix
                 out.append(
                     self.ustring(
                         indent,
                         self.GREEN,
                         line,
-                        prefix=prefix
+                        prefix=line_prefix
                     )
                 )
+                first_line = False
         elif isinstance(ret, (list, tuple)):
             for ind in ret:
                 if isinstance(ind, (list, tuple, dict)):

salt/states/dockerio.py

@@ -18,8 +18,8 @@ wrapper. The base supported wrapper type is
 .. note::
 
     This state module requires
-    `docker-py <https://github.com/dotcloud/docker-py>`_
-    which supports `Docker Remote API version 1.6
+    `docker-py <https://github.com/dotcloud/docker-py>`_ version >= 0.6.0
+    which supports `Docker Remote API version 1.12
     <http://docs.docker.io/en/latest/reference/api/docker_remote_api_v1.6>`_.
 
 Available Functions

salt/states/npm.py

@@ -192,13 +192,9 @@ def installed(name,
             'runas': user,
             'registry': registry,
             'env': env,
+            'pkgs': pkg_list,
         }
 
-        if pkgs is not None:
-            cmd_args['pkgs'] = pkgs
-        else:
-            cmd_args['pkg'] = pkg_name
-
         call = __salt__['npm.install'](**cmd_args)
     except (CommandNotFoundError, CommandExecutionError) as err:
         ret['result'] = False