From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 20 Nov 2014 06:23:01 +0000 (+0000)
Subject: Merge "Implementing the use of _L’x’/i18n markers"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1d77d79f81cf5e6a808453432f6e510ad0ea5a25;p=openstack-build%2Fcinder-build.git

Merge "Implementing the use of _L’x’/i18n markers"
---

1d77d79f81cf5e6a808453432f6e510ad0ea5a25
diff --cc cinder/volume/drivers/emc/emc_vnx_cli.py
index 41fa66b49,a8abba947..70810c7cd
--- a/cinder/volume/drivers/emc/emc_vnx_cli.py
+++ b/cinder/volume/drivers/emc/emc_vnx_cli.py
@@@ -27,8 -26,9 +27,8 @@@ import si
  
  from cinder import exception
  from cinder.exception import EMCVnxCLICmdError
- from cinder.i18n import _
+ from cinder.i18n import _, _LE, _LI, _LW
  from cinder.openstack.common import excutils
 -from cinder.openstack.common import jsonutils as json
  from cinder.openstack.common import lockutils
  from cinder.openstack.common import log as logging
  from cinder.openstack.common import loopingcall