Merge "Use oslo.i18n"

diff --cc bin/cinder-manage
Simple merge

diff --cc bin/cinder-rtstool
Simple merge

diff --cc cinder/db/sqlalchemy/api.py
Simple merge

diff --cc cinder/utils.py
Simple merge

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

diff --cc cinder/volume/drivers/emc/emc_smis_common.py
Simple merge

diff --cc cinder/volume/drivers/emc/emc_vnx_cli.py
Simple merge

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

diff --cc cinder/volume/drivers/netapp/iscsi.py
Simple merge

diff --cc cinder/volume/drivers/san/hp/hp_3par_common.py
Simple merge

diff --cc cinder/volume/drivers/san/hp/hp_3par_iscsi.py
Simple merge

diff --cc cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py
Simple merge

diff --cc cinder/volume/drivers/vmware/vmdk.py
index fa077e369cbd4d521870e996a06e95ef9310ec8c,b301d3ba20ac2e811bdfd91808b3efda9eb561a9..bb5d3275a549b289360436412ae04f743009ca0f
--- 1/cinder/volume/drivers/vmware/vmdk.py
--- 2/cinder/volume/drivers/vmware/vmdk.py
+++ b/cinder/volume/drivers/vmware/vmdk.py
@@@ -28,11 -28,10 +28,11 @@@ import o
  from oslo.config import cfg
  
  from cinder import exception
+ from cinder.i18n import _
  from cinder.openstack.common import excutils
- from cinder.openstack.common.gettextutils import _
  from cinder.openstack.common import log as logging
  from cinder.openstack.common import units
 +from cinder.openstack.common import uuidutils
  from cinder.volume import driver
  from cinder.volume.drivers.vmware import api
  from cinder.volume.drivers.vmware import error_util

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

diff --cc tox.ini
Simple merge