]> 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: aa44c8b 2b39ec4)
Merge "LeftHand: Implement v2 replication (managed)"
authorJenkins <jenkins@review.openstack.org>
Fri, 15 Jan 2016 08:22:51 +0000 (08:22 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 15 Jan 2016 08:22:52 +0000 (08:22 +0000)
1  2 
cinder/tests/unit/test_hpelefthand.py patch | diff1 | diff2 | blob | history
cinder/volume/drivers/hpe/hpe_lefthand_iscsi.py patch | diff1 | diff2 | blob | history

diff --cc cinder/tests/unit/test_hpelefthand.py
Simple merge
diff --cc cinder/volume/drivers/hpe/hpe_lefthand_iscsi.py
index 370bd48a420787b1531c7180259f23432e417bb9,bc89ba3a9c6582c3f0fbbfd076bf54d23bce17b2..4a5d8429ba97f47d20bd5c167196049fa4d48839
--- 1/cinder/volume/drivers/hpe/hpe_lefthand_iscsi.py
--- 2/cinder/volume/drivers/hpe/hpe_lefthand_iscsi.py
+++ b/cinder/volume/drivers/hpe/hpe_lefthand_iscsi.py
@@@ -43,8 -44,8 +44,9 @@@ from oslo_utils import unit
  from cinder import context
  from cinder import exception
  from cinder.i18n import _, _LE, _LI, _LW
 +from cinder.objects import fields
  from cinder.volume import driver
+ from cinder.volume.drivers.san import san
  from cinder.volume import utils
  from cinder.volume import volume_types