summaryrefslogtreecommitdiffstats
path: root/openstack/common/rpc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-10-30 21:40:05 +0000
committerGerrit Code Review <review@openstack.org>2012-10-30 21:40:05 +0000
commit4747dff07fadf0e3e54c5bcafc5b89b261c37f5d (patch)
tree1a9f850480e96cd29404f95d011a6fe1afa25095 /openstack/common/rpc
parent4b017d73df7f7046ead3dc21a7642601438113f4 (diff)
parentb153b563908e91ce1bbce0ab9f019d3fba0b2162 (diff)
downloadoslo-4747dff07fadf0e3e54c5bcafc5b89b261c37f5d.tar.gz
oslo-4747dff07fadf0e3e54c5bcafc5b89b261c37f5d.tar.xz
oslo-4747dff07fadf0e3e54c5bcafc5b89b261c37f5d.zip
Merge "Import order clean-up"
Diffstat (limited to 'openstack/common/rpc')
-rw-r--r--openstack/common/rpc/impl_kombu.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/openstack/common/rpc/impl_kombu.py b/openstack/common/rpc/impl_kombu.py
index fc34de1..e9118d6 100644
--- a/openstack/common/rpc/impl_kombu.py
+++ b/openstack/common/rpc/impl_kombu.py
@@ -31,9 +31,9 @@ import kombu.messaging
from openstack.common import cfg
from openstack.common.gettextutils import _
+from openstack.common import network_utils
from openstack.common.rpc import amqp as rpc_amqp
from openstack.common.rpc import common as rpc_common
-from openstack.common import network_utils
kombu_opts = [
cfg.StrOpt('kombu_ssl_version',