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 /bin | |
| parent | 30c363beebc9c17897997c5622802e884d0afda6 (diff) | |
| parent | 9871c5f963b6d98240635a9a447d14d46133c910 (diff) | |
Merge "Move cfg to nova.openstack.common"
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/clear_rabbit_queues | 2 | ||||
| -rwxr-xr-x | bin/nova-ajax-console-proxy | 2 | ||||
| -rwxr-xr-x | bin/nova-direct-api | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/bin/clear_rabbit_queues b/bin/clear_rabbit_queues index f697ef6b4..9d0d803a5 100755 --- a/bin/clear_rabbit_queues +++ b/bin/clear_rabbit_queues @@ -40,11 +40,11 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')): gettext.install('nova', unicode=1) -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 rpc from nova import utils diff --git a/bin/nova-ajax-console-proxy b/bin/nova-ajax-console-proxy index 7dd5266a7..94d93cd0e 100755 --- a/bin/nova-ajax-console-proxy +++ b/bin/nova-ajax-console-proxy @@ -38,9 +38,9 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): sys.path.insert(0, possible_topdir) -from nova.common import cfg from nova import flags from nova import log as logging +from nova.openstack.common import cfg from nova import rpc from nova import service from nova import utils diff --git a/bin/nova-direct-api b/bin/nova-direct-api index f77311914..6a79ef626 100755 --- a/bin/nova-direct-api +++ b/bin/nova-direct-api @@ -35,11 +35,11 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): sys.path.insert(0, possible_topdir) -from nova.common import cfg from nova import compute from nova import flags from nova import log as logging from nova import network +from nova.openstack.common import cfg from nova import service from nova import utils from nova import volume |