]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commitdiff
Code Review / openstack-build / cinder-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: b2b5b26 2c0cf8f)
Merge "IBM Storwize driver Consistency Group Implementation"
authorJenkins <jenkins@review.openstack.org>
Fri, 30 Jan 2015 18:18:37 +0000 (18:18 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 30 Jan 2015 18:18:38 +0000 (18:18 +0000)
1  2 
cinder/tests/test_storwize_svc.py patch | diff1 | diff2 | blob | history
cinder/volume/drivers/ibm/storwize_svc/__init__.py patch | diff1 | diff2 | blob | history
cinder/volume/drivers/ibm/storwize_svc/helpers.py patch | diff1 | diff2 | blob | history

diff --cc cinder/tests/test_storwize_svc.py
Simple merge
diff --cc cinder/volume/drivers/ibm/storwize_svc/helpers.py
index c4a60cc7562fbaba2b83855253baf30dfce0cf99,d1aaea52d9a7079552eeb15a885b1e8d5f7da9d0..ab5928a478a6c2c99516f3b6421342b4d36ebdf7
--- 1/cinder/volume/drivers/ibm/storwize_svc/helpers.py
--- 2/cinder/volume/drivers/ibm/storwize_svc/helpers.py
+++ b/cinder/volume/drivers/ibm/storwize_svc/helpers.py
@@@ -16,11 -16,13 +16,13 @@@
  
  import random
  import re
+ import time
  import unicodedata
  
+ 
  from eventlet import greenthread
 -from oslo.utils import excutils
 -from oslo.utils import strutils
 +from oslo_utils import excutils
 +from oslo_utils import strutils
  import six
  
  from cinder import context