summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-07-06 21:10:16 +0000
committerGerrit Code Review <review@openstack.org>2012-07-06 21:10:16 +0000
commit45a6a91e893294bdcd3b4fe38669171ac10ffe13 (patch)
tree8a27a6b008286a4630baa690b1aada2fd92ea6b5
parent0598db0a6c66eb2b6d2e0e3f0b3b2b921ebe8621 (diff)
parent626632d4cbd5de26cc2793c9d18b599b074c507e (diff)
downloadnova-45a6a91e893294bdcd3b4fe38669171ac10ffe13.tar.gz
nova-45a6a91e893294bdcd3b4fe38669171ac10ffe13.tar.xz
nova-45a6a91e893294bdcd3b4fe38669171ac10ffe13.zip
Merge "Fix rpc import path in nova-novncproxy"
-rwxr-xr-xbin/nova-novncproxy2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/nova-novncproxy b/bin/nova-novncproxy
index 2c834d13a..e8e772739 100755
--- a/bin/nova-novncproxy
+++ b/bin/nova-novncproxy
@@ -32,7 +32,7 @@ from nova import context
from nova import flags
from nova.openstack.common import cfg
from nova.openstack.common import log as logging
-from nova import rpc
+from nova.openstack.common import rpc
from nova import utils