diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-03 19:50:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-03 19:50:45 +0000 |
| commit | cd0df1e8b09d1ccf17e6fabed3aaafc7356b9486 (patch) | |
| tree | 6b9e1fa5ec898393a6a6fbaf0da888f6e0c8f31e /nova/api | |
| parent | 30c363beebc9c17897997c5622802e884d0afda6 (diff) | |
| parent | 9871c5f963b6d98240635a9a447d14d46133c910 (diff) | |
| download | nova-cd0df1e8b09d1ccf17e6fabed3aaafc7356b9486.tar.gz nova-cd0df1e8b09d1ccf17e6fabed3aaafc7356b9486.tar.xz nova-cd0df1e8b09d1ccf17e6fabed3aaafc7356b9486.zip | |
Merge "Move cfg to nova.openstack.common"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/auth.py | 2 | ||||
| -rw-r--r-- | nova/api/ec2/__init__.py | 2 | ||||
| -rw-r--r-- | nova/api/openstack/compute/__init__.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nova/api/auth.py b/nova/api/auth.py index 84ba3376d..cb601bdb3 100644 --- a/nova/api/auth.py +++ b/nova/api/auth.py @@ -21,10 +21,10 @@ Common Auth Middleware. import webob.dec import webob.exc -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 wsgi diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index 3ee89c9c2..bcd7b239e 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -32,11 +32,11 @@ from nova.api.ec2 import ec2utils from nova.api.ec2 import faults from nova.api import validator from nova.auth import manager -from nova.common import cfg from nova import context from nova import exception from nova import flags from nova import log as logging +from nova.openstack.common import cfg from nova import utils from nova import wsgi diff --git a/nova/api/openstack/compute/__init__.py b/nova/api/openstack/compute/__init__.py index d035173ed..3884ffbad 100644 --- a/nova/api/openstack/compute/__init__.py +++ b/nova/api/openstack/compute/__init__.py @@ -31,9 +31,9 @@ from nova.api.openstack.compute import limits from nova.api.openstack.compute import servers from nova.api.openstack.compute import server_metadata from nova.api.openstack.compute import versions -from nova.common import cfg from nova import flags from nova import log as logging +from nova.openstack.common import cfg LOG = logging.getLogger('nova.api.openstack.compute') |