From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 12 Jan 2016 08:37:24 +0000 (+0000)
Subject: Merge "Add ConsistencyGroupStatus enum field"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b152685fa40b4408956929f612673a4763b4803e;p=openstack-build%2Fcinder-build.git

Merge "Add ConsistencyGroupStatus enum field"
---

b152685fa40b4408956929f612673a4763b4803e
diff --cc cinder/tests/unit/test_dellsc.py
index 7ae9566c4,0889186c1..1c3cfdb20
--- a/cinder/tests/unit/test_dellsc.py
+++ b/cinder/tests/unit/test_dellsc.py
@@@ -17,8 -17,10 +17,9 @@@ import uui
  
  from cinder import context
  from cinder import exception
+ from cinder.objects import fields
  from cinder import test
  from cinder.volume.drivers.dell import dell_storagecenter_api
 -from cinder.volume.drivers.dell import dell_storagecenter_common
  from cinder.volume.drivers.dell import dell_storagecenter_iscsi
  from cinder.volume import volume_types