From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 15 Jan 2016 08:22:51 +0000 (+0000)
Subject: Merge "LeftHand: Implement v2 replication (managed)"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f1c692b8fcc2eed4ca9233bb79a6cd9f1a809f15;p=openstack-build%2Fcinder-build.git

Merge "LeftHand: Implement v2 replication (managed)"
---

f1c692b8fcc2eed4ca9233bb79a6cd9f1a809f15
diff --cc cinder/volume/drivers/hpe/hpe_lefthand_iscsi.py
index 370bd48a4,bc89ba3a9..4a5d8429b
--- a/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