From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 17 Dec 2015 22:00:08 +0000 (+0000)
Subject: Merge "Change the format of some inconsistent docstring"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=9431bc150cba71c6787a534c04644946d7bc8c6a;p=openstack-build%2Fcinder-build.git

Merge "Change the format of some inconsistent docstring"
---

9431bc150cba71c6787a534c04644946d7bc8c6a
diff --cc cinder/volume/drivers/hpe/hpe_3par_common.py
index 4b479a570,d33c59b3c..ea19c2816
--- a/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: