]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commitdiff
Merge "Add error handling to _connect function in PureISCSIDriver"
authorJenkins <jenkins@review.openstack.org>
Tue, 23 Dec 2014 08:08:03 +0000 (08:08 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 23 Dec 2014 08:08:03 +0000 (08:08 +0000)
1  2 
cinder/tests/test_pure.py
cinder/volume/drivers/pure.py

Simple merge
index 1a7b2380c736c87d892e4228f742fd6c784fe439,a071a0f7aa1dcc11fecc4d1cee9570c85a840992..31dfe760e38e2e541256c1c08eb75c539239d311
@@@ -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