diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2012-02-03 00:50:58 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-02-03 19:21:54 +0000 |
| commit | 9871c5f963b6d98240635a9a447d14d46133c910 (patch) | |
| tree | f58c68d5e2dbb98c494b142097832f3679d157ce /nova/vnc | |
| parent | 9dadca1f3a8fda00d93f429846dce6bd8ae534a2 (diff) | |
| download | nova-9871c5f963b6d98240635a9a447d14d46133c910.tar.gz | |
Move cfg to nova.openstack.common
Move it here so that it can be kept in sync with openstack-common using
the new update.py script for code in openstack-common's incubation area.
See here for more details:
http://wiki.openstack.org/CommonLibrary#Incubation
Note: this commit just moves the existing code in Nova with no other
changes. A subsequent commit will sync it with latest openstack-common
so that it is easier see the new changes.
Change-Id: If88d678b1b9bad3d37117de7f7159d7fea8ab4c8
Diffstat (limited to 'nova/vnc')
| -rw-r--r-- | nova/vnc/__init__.py | 2 | ||||
| -rw-r--r-- | nova/vnc/xvp_proxy.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/vnc/__init__.py b/nova/vnc/__init__.py index 0b25812034..ba7268e974 100644 --- a/nova/vnc/__init__.py +++ b/nova/vnc/__init__.py @@ -18,8 +18,8 @@ """Module for VNC Proxying.""" -from nova.common import cfg from nova import flags +from nova.openstack.common import cfg vnc_opts = [ diff --git a/nova/vnc/xvp_proxy.py b/nova/vnc/xvp_proxy.py index bf9ee5975b..dfaf9a47ac 100644 --- a/nova/vnc/xvp_proxy.py +++ b/nova/vnc/xvp_proxy.py @@ -26,10 +26,10 @@ import eventlet.green import eventlet.greenio import eventlet.wsgi -from nova.common import cfg from nova import context from nova import flags from nova import log as logging +from nova.openstack.common import cfg from nova import rpc from nova import version from nova import wsgi |