From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 23 Dec 2014 08:08:03 +0000 (+0000)
Subject: Merge "Add error handling to _connect function in PureISCSIDriver"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=664a924db7833c9dcedfbe41ecd6490218a4e3ac;p=openstack-build%2Fcinder-build.git

Merge "Add error handling to _connect function in PureISCSIDriver"
---

664a924db7833c9dcedfbe41ecd6490218a4e3ac
diff --cc cinder/volume/drivers/pure.py
index 1a7b2380c,a071a0f7a..31dfe760e
--- a/cinder/volume/drivers/pure.py
+++ b/cinder/volume/drivers/pure.py
@@@ -27,10 -27,10 +27,10 @@@ import uui
  from oslo.config import cfg
  from oslo.utils import excutils
  from oslo.utils import units
 +from oslo_concurrency import processutils
  
  from cinder import exception
- from cinder.i18n import _LE, _LI, _LW
+ from cinder.i18n import _, _LE, _LI, _LW
  from cinder.openstack.common import log as logging
  from cinder import utils
  from cinder.volume.drivers.san import san