Merge "Fix multi-line docstrings to meet hacking rules"

diff --cc cinder/backup/manager.py
Simple merge

diff --cc cinder/cmd/manage.py
Simple merge

diff --cc cinder/image/glance.py
Simple merge

diff --cc cinder/tests/unit/test_ibm_flashsystem.py
Simple merge

diff --cc cinder/tests/unit/test_rbd.py
Simple merge

diff --cc cinder/tests/unit/test_srb.py
Simple merge

diff --cc cinder/tests/unit/test_volume.py
Simple merge

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

diff --cc cinder/volume/drivers/hitachi/hnas_backend.py
Simple merge

diff --cc cinder/volume/drivers/hitachi/hnas_iscsi.py
Simple merge

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

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

diff --cc cinder/volume/drivers/windows/windows.py
index df765b8670cdc5908fdfe70a2cf05473b43cf08f,962d0e1f21237d7bd5d6d792e4e6c7a07e4ffbb3..192728fc2f3c06b9c6e8bd4154331fe271242a7c
--- 1/cinder/volume/drivers/windows/windows.py
--- 2/cinder/volume/drivers/windows/windows.py
+++ b/cinder/volume/drivers/windows/windows.py
@@@ -162,11 -142,10 +162,10 @@@ class WindowsDriver(driver.ISCSIDriver)
          vol_name = volume['name']
          self.utils.add_disk_to_target(vol_name, target_name)
  
 -        return {'provider_location': target_name}
 +        return updates
  
      def remove_export(self, context, volume):
-         """Driver entry point to remove an export for a volume.
-         """
+         """Driver entry point to remove an export for a volume."""
          target_name = "%s%s" % (self.configuration.iscsi_target_prefix,
                                  volume['name'])
  

diff --cc cinder/volume/drivers/windows/windows_utils.py
Simple merge