summaryrefslogtreecommitdiffstats
path: root/nova/vnc
diff options
context:
space:
mode:
authorAndrew Bogott <abogott@wikimedia.org>2012-06-28 15:59:23 -0500
committerAndrew Bogott <abogott@wikimedia.org>2012-07-02 15:57:09 -0500
commitd335457f48d09c3d780c92413fe777030c1335e2 (patch)
tree3403e3548f1a374b002470f8c7c399a9e8eed381 /nova/vnc
parent2038e933bd8bde659e31b4a78e2211a585e3dcec (diff)
downloadnova-d335457f48d09c3d780c92413fe777030c1335e2.tar.gz
nova-d335457f48d09c3d780c92413fe777030c1335e2.tar.xz
nova-d335457f48d09c3d780c92413fe777030c1335e2.zip
Switch to common logging.
I only just moved logging from nova to common, so behavior should remain the same. Change-Id: I1d7304ca200f9d024bb7244d25be2f9a670318fb
Diffstat (limited to 'nova/vnc')
-rw-r--r--nova/vnc/xvp_proxy.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/vnc/xvp_proxy.py b/nova/vnc/xvp_proxy.py
index ecf5c2551..c8b779a37 100644
--- a/nova/vnc/xvp_proxy.py
+++ b/nova/vnc/xvp_proxy.py
@@ -29,8 +29,8 @@ import eventlet.wsgi
from nova.consoleauth import rpcapi as consoleauth_rpcapi
from nova import context
from nova import flags
-from nova import log as logging
from nova.openstack.common import cfg
+from nova.openstack.common import log as logging
from nova import version
from nova import wsgi