From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 25 Jun 2014 19:00:34 +0000 (+0000)
Subject: Merge "I/O rate limit for volume copy with qemu-img convert"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d69aa545aa0660a6147490cd4cc137acd991217f;p=openstack-build%2Fcinder-build.git

Merge "I/O rate limit for volume copy with qemu-img convert"
---

d69aa545aa0660a6147490cd4cc137acd991217f
diff --cc cinder/tests/test_image_utils.py
index d1fe46bfb,39666bd30..f06cd904d
--- a/cinder/tests/test_image_utils.py
+++ b/cinder/tests/test_image_utils.py
@@@ -23,9 -25,12 +25,12 @@@ from cinder import contex
  from cinder import exception
  from cinder.image import image_utils
  from cinder.openstack.common import processutils
 +from cinder.openstack.common import units
  from cinder import test
 -from cinder import units
  from cinder import utils
+ from cinder.volume import utils as volume_utils
+ 
+ CONF = cfg.CONF
  
  
  class FakeImageService: