From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 23 Jan 2015 23:34:21 +0000 (+0000)
Subject: Merge "Remove usage of taskflow 'utils.misc' module"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c963fbb6f2a7e9b23fd5a1d1df2149c7b56d7353;p=openstack-build%2Fcinder-build.git

Merge "Remove usage of taskflow 'utils.misc' module"
---

c963fbb6f2a7e9b23fd5a1d1df2149c7b56d7353
diff --cc cinder/volume/flows/api/create_volume.py
index 1f1cd3d4e,3d763d52e..017bc87a9
--- a/cinder/volume/flows/api/create_volume.py
+++ b/cinder/volume/flows/api/create_volume.py
@@@ -11,12 -11,12 +11,12 @@@
  #    under the License.
  
  
 -from oslo.utils import timeutils
 -from oslo.utils import units
  from oslo_config import cfg
 +from oslo_utils import timeutils
 +from oslo_utils import units
  import taskflow.engines
  from taskflow.patterns import linear_flow
- from taskflow.utils import misc
+ from taskflow.types import failure as ft
  
  from cinder import exception
  from cinder import flow_utils
diff --cc cinder/volume/flows/manager/create_volume.py
index cea0b2e61,5ccb109b1..acc50fabb
--- a/cinder/volume/flows/manager/create_volume.py
+++ b/cinder/volume/flows/manager/create_volume.py
@@@ -12,12 -12,12 +12,12 @@@
  
  import traceback
  
 -from oslo.utils import timeutils
  from oslo_concurrency import processutils
  from oslo_config import cfg
 +from oslo_utils import timeutils
  import taskflow.engines
  from taskflow.patterns import linear_flow
- from taskflow.utils import misc
+ from taskflow.types import failure as ft
  
  from cinder import exception
  from cinder import flow_utils