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

diff --cc cinder/volume/drivers/emc/emc_vnx_cli.py
index 41fa66b49d7d7b335ffa3a0e53e6c1b061bb3f4f,a8abba9472b0aaedd3589e95df8ecd5757835009..70810c7cd1b7e2795d90cfcefbd5bfe0cff47c76
--- 1/cinder/volume/drivers/emc/emc_vnx_cli.py
--- 2/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

diff --cc cinder/volume/drivers/rbd.py
Simple merge

diff --cc cinder/volume/drivers/sheepdog.py
Simple merge

diff --cc cinder/volume/drivers/solidfire.py
Simple merge

diff --cc cinder/volume/drivers/vmware/read_write_util.py
Simple merge

diff --cc cinder/volume/manager.py
Simple merge