summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-07-27 20:47:51 +0000
committerGerrit Code Review <review@openstack.org>2012-07-27 20:47:51 +0000
commitf6f6c36bb34a06e7afd1c3a7ebbc5ae098c20628 (patch)
tree9b8abf912ec2d180f5db4566917a9cad15eb3b7f
parentaad7743f42e559aefde37bb44622986df4e2ae98 (diff)
parent395c71a05a256a3d50a4dca7f91357c3175d94f6 (diff)
Merge "Fix HACKING violation in nova/api/openstack/volume/types.py"
-rw-r--r--nova/api/openstack/volume/types.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/openstack/volume/types.py b/nova/api/openstack/volume/types.py
index 0a750d86b..a39d2a1f6 100644
--- a/nova/api/openstack/volume/types.py
+++ b/nova/api/openstack/volume/types.py
@@ -19,8 +19,8 @@
from webob import exc
-from nova.api.openstack import wsgi
from nova.api.openstack.volume.views import types as views_types
+from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil
from nova import exception
from nova.volume import volume_types