From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 30 Jan 2015 18:18:37 +0000 (+0000)
Subject: Merge "IBM Storwize driver Consistency Group Implementation"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b42395af1de5289128eb04fc8c246e8980cb99ef;p=openstack-build%2Fcinder-build.git

Merge "IBM Storwize driver Consistency Group Implementation"
---

b42395af1de5289128eb04fc8c246e8980cb99ef
diff --cc cinder/volume/drivers/ibm/storwize_svc/helpers.py
index c4a60cc75,d1aaea52d..ab5928a47
--- a/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