summaryrefslogtreecommitdiffstats
path: root/openstack/common/rpc/matchmaker.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-11-29 14:52:09 +0000
committerGerrit Code Review <review@openstack.org>2012-11-29 14:52:09 +0000
commit582cb960066a02ae247097c8a96484655429fbe1 (patch)
tree74a8a62ea0beca51777154572c07269c28e7ed04 /openstack/common/rpc/matchmaker.py
parentf888f83116ac7cfcf26aa4ed2243c15fbec882c6 (diff)
parentfaeafe169a260d10b3a8d91cd7a60b5669b9a8f1 (diff)
downloadoslo-582cb960066a02ae247097c8a96484655429fbe1.tar.gz
oslo-582cb960066a02ae247097c8a96484655429fbe1.tar.xz
oslo-582cb960066a02ae247097c8a96484655429fbe1.zip
Merge "Fixes import order"
Diffstat (limited to 'openstack/common/rpc/matchmaker.py')
-rw-r--r--openstack/common/rpc/matchmaker.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/openstack/common/rpc/matchmaker.py b/openstack/common/rpc/matchmaker.py
index c5cc64c..48270ba 100644
--- a/openstack/common/rpc/matchmaker.py
+++ b/openstack/common/rpc/matchmaker.py
@@ -23,8 +23,8 @@ import itertools
import json
from openstack.common import cfg
-from openstack.common import log as logging
from openstack.common.gettextutils import _
+from openstack.common import log as logging
matchmaker_opts = [