From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 9 Aug 2014 15:04:13 +0000 (+0000)
Subject: Merge "Use oslo.i18n"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=029b9309c7f027f8d218961901eee1e36e1087eb;p=openstack-build%2Fcinder-build.git

Merge "Use oslo.i18n"
---

029b9309c7f027f8d218961901eee1e36e1087eb
diff --cc cinder/volume/drivers/vmware/vmdk.py
index fa077e369,b301d3ba2..bb5d3275a
--- a/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