From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 2 Sep 2015 18:22:12 +0000 (+0000)
Subject: Merge "Cleanup for SnapshotObject"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=540bba7f8e049e0eea304ec21ed2da2d03319125;p=openstack-build%2Fcinder-build.git

Merge "Cleanup for SnapshotObject"
---

540bba7f8e049e0eea304ec21ed2da2d03319125
diff --cc cinder/tests/unit/test_volume_utils.py
index 8baecd4c3,92cc67269..508e69070
--- a/cinder/tests/unit/test_volume_utils.py
+++ b/cinder/tests/unit/test_volume_utils.py
@@@ -17,8 -17,8 +17,9 @@@
  
  
  import datetime
 +import io
  import mock
+ import six
  
  from oslo_concurrency import processutils
  from oslo_config import cfg