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/compute | |
| parent | 30c363beebc9c17897997c5622802e884d0afda6 (diff) | |
| parent | 9871c5f963b6d98240635a9a447d14d46133c910 (diff) | |
Merge "Move cfg to nova.openstack.common"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 2 | ||||
| -rw-r--r-- | nova/compute/manager.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 42c4ea4f0..f54d184dd 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -28,7 +28,6 @@ import novaclient import webob.exc from nova import block_device -from nova.common import cfg from nova.compute import aggregate_states from nova.compute import instance_types from nova.compute import power_state @@ -40,6 +39,7 @@ from nova import flags import nova.image from nova import log as logging from nova import network +from nova.openstack.common import cfg import nova.policy from nova import quota from nova import rpc diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 0d49a19c4..64401eeca 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -45,7 +45,6 @@ from eventlet import greenthread from nova import block_device import nova.context -from nova.common import cfg from nova.compute import instance_types from nova.compute import power_state from nova.compute import task_states @@ -59,6 +58,7 @@ from nova import manager from nova import network from nova.network import model as network_model from nova.notifier import api as notifier +from nova.openstack.common import cfg from nova import rpc from nova import utils from nova.virt import driver |