Merge "Change the format of some inconsistent docstring"

diff --cc cinder/utils.py
Simple merge

diff --cc cinder/volume/driver.py
Simple merge

diff --cc cinder/volume/drivers/emc/xtremio.py
Simple merge

diff --cc cinder/volume/drivers/hpe/hpe_3par_common.py
index 4b479a570c9016608e2de959579e75e26a0b6ffb,d33c59b3c3f68e7ddae4376f06055a5583991161..ea19c2816f2d28c3bb288761c62fd0f329abda7b
--- 1/cinder/volume/drivers/hpe/hpe_3par_common.py
--- 2/cinder/volume/drivers/hpe/hpe_3par_common.py
+++ b/cinder/volume/drivers/hpe/hpe_3par_common.py
@@@ -1693,9 -1587,9 +1693,9 @@@ class HPE3PARCommon(object)
  
          :param volume_host: The volume's host string.
          :param cpg: The actual pool (cpg) used, for example from the type.
-         :return: dict Model update if we need to update volume host, else None
+         :returns: dict Model update if we need to update volume host, else None
          """
 -        model_update = None
 +        model_update = {}
          host = volume_utils.extract_host(volume_host, 'backend')
          host_and_pool = volume_utils.append_host(host, cpg)
          if volume_host != host_and_pool:

diff --cc cinder/volume/drivers/ibm/storwize_svc/__init__.py
Simple merge

diff --cc cinder/volume/drivers/lvm.py
Simple merge

diff --cc cinder/volume/drivers/netapp/eseries/client.py
Simple merge

diff --cc cinder/volume/drivers/netapp/eseries/library.py
Simple merge