summaryrefslogtreecommitdiffstats
path: root/bin/nova-ajax-console-proxy
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-02-03 19:50:45 +0000
committerGerrit Code Review <review@openstack.org>2012-02-03 19:50:45 +0000
commitcd0df1e8b09d1ccf17e6fabed3aaafc7356b9486 (patch)
tree6b9e1fa5ec898393a6a6fbaf0da888f6e0c8f31e /bin/nova-ajax-console-proxy
parent30c363beebc9c17897997c5622802e884d0afda6 (diff)
parent9871c5f963b6d98240635a9a447d14d46133c910 (diff)
downloadnova-cd0df1e8b09d1ccf17e6fabed3aaafc7356b9486.tar.gz
nova-cd0df1e8b09d1ccf17e6fabed3aaafc7356b9486.tar.xz
nova-cd0df1e8b09d1ccf17e6fabed3aaafc7356b9486.zip
Merge "Move cfg to nova.openstack.common"
Diffstat (limited to 'bin/nova-ajax-console-proxy')
-rwxr-xr-xbin/nova-ajax-console-proxy2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/nova-ajax-console-proxy b/bin/nova-ajax-console-proxy
index 7dd5266a7..94d93cd0e 100755
--- a/bin/nova-ajax-console-proxy
+++ b/bin/nova-ajax-console-proxy
@@ -38,9 +38,9 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
sys.path.insert(0, possible_topdir)
-from nova.common import cfg
from nova import flags
from nova import log as logging
+from nova.openstack.common import cfg
from nova import rpc
from nova import service
from nova import utils