From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 2 Dec 2015 10:36:28 +0000 (+0000)
Subject: Merge "Delete unused codes in rbd.retype"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=4d235771cf9baddf8f344ad1dfc3472f88a02ab7;p=openstack-build%2Fcinder-build.git

Merge "Delete unused codes in rbd.retype"
---

4d235771cf9baddf8f344ad1dfc3472f88a02ab7
diff --cc cinder/tests/unit/test_rbd.py
index 91eeebe7d,c92c984cc..a163dfb35
--- a/cinder/tests/unit/test_rbd.py
+++ b/cinder/tests/unit/test_rbd.py
@@@ -26,8 -27,9 +26,9 @@@ from oslo_utils import unit
  from cinder import exception
  from cinder.i18n import _
  from cinder.image import image_utils
 +from cinder import objects
  from cinder import test
+ from cinder.tests.unit import fake_volume
  from cinder.tests.unit.image import fake as fake_image
  from cinder.tests.unit import test_volume
  from cinder.tests.unit import utils