summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Erdfelt <johannes.erdfelt@rackspace.com>2012-07-03 23:54:58 +0000
committerJohannes Erdfelt <johannes.erdfelt@rackspace.com>2012-07-03 23:54:58 +0000
commit63ce7031d1b0fd0c251fffea55bc7120e3d1f6b0 (patch)
tree2c8a0ad202a9de32f727884a0ce00341c3c5fa67
parentff5981b59b6fc5b280af101c2309acb5b7324dab (diff)
downloadnova-folsom-2.tar.gz
Fix missing nova.log change to nova.openstack.common.logfolsom-2
This appears to have slipped through the cracks in the recent move from nova.log to nova.openstack.common.log Change-Id: I4935c6e1ba0681a31c081b580f1afecc676c5697
-rwxr-xr-xbin/nova-novncproxy2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/nova-novncproxy b/bin/nova-novncproxy
index 30a13612e0..2c834d13ab 100755
--- a/bin/nova-novncproxy
+++ b/bin/nova-novncproxy
@@ -30,8 +30,8 @@ import websockify
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 rpc
from nova import utils