diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-20 08:50:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-20 08:50:18 +0000 |
| commit | e37e02870216ea6de130ce3d1b2e8f642de9faf6 (patch) | |
| tree | d3eef37cf671a7879303d3f693e8621c75377fe3 /nova/manager.py | |
| parent | 512490200e009bce3cb155fcea683e9776d67658 (diff) | |
| parent | 706a1370056ffccc2c8811fc1ac0679944564ece (diff) | |
| download | nova-e37e02870216ea6de130ce3d1b2e8f642de9faf6.tar.gz nova-e37e02870216ea6de130ce3d1b2e8f642de9faf6.tar.xz nova-e37e02870216ea6de130ce3d1b2e8f642de9faf6.zip | |
Merge "Use oslo-config-2013.1b4"
Diffstat (limited to 'nova/manager.py')
| -rw-r--r-- | nova/manager.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/manager.py b/nova/manager.py index a0269d30b..cc7d464ca 100644 --- a/nova/manager.py +++ b/nova/manager.py @@ -53,12 +53,13 @@ This module provides Manager, a base class for managers. """ -import eventlet import time +import eventlet +from oslo.config import cfg + from nova.db import base from nova import exception -from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova.openstack.common.plugin import pluginmanager from nova.openstack.common.rpc import dispatcher as rpc_dispatcher |