From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 17 Mar 2015 01:40:27 +0000 (+0000)
Subject: Merge "VMware:Use datastore selection logic in new module"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d4b77484c5d41f207d54f40dcdd530fb8a1b1ea6;p=openstack-build%2Fcinder-build.git

Merge "VMware:Use datastore selection logic in new module"
---

d4b77484c5d41f207d54f40dcdd530fb8a1b1ea6
diff --cc cinder/volume/drivers/vmware/vmdk.py
index 02a87e87c,f3f3fbd48..9e65cc515
--- a/cinder/volume/drivers/vmware/vmdk.py
+++ b/cinder/volume/drivers/vmware/vmdk.py
@@@ -42,8 -41,10 +42,9 @@@ import si
  from cinder import exception
  from cinder.i18n import _, _LE, _LI, _LW
  from cinder.openstack.common import fileutils
 -from cinder.openstack.common import log as logging
  from cinder.volume import driver
  from cinder.volume.drivers.vmware import datastore as hub
+ from cinder.volume.drivers.vmware import exceptions as vmdk_exceptions
  from cinder.volume.drivers.vmware import volumeops
  from cinder.volume import volume_types