]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commitdiff
Merge "VMware:Use datastore selection logic in new module"
authorJenkins <jenkins@review.openstack.org>
Tue, 17 Mar 2015 01:40:27 +0000 (01:40 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 17 Mar 2015 01:40:27 +0000 (01:40 +0000)
1  2 
cinder/tests/test_vmware_vmdk.py
cinder/volume/drivers/vmware/vmdk.py

Simple merge
index 02a87e87ce341cf41450176c5bb8fd5fc909fc51,f3f3fbd48bd6ac00061655de9c5eb15ea5c637b3..9e65cc515ba0b55549d48132788deae917c5384c
@@@ -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