summaryrefslogtreecommitdiffstats
path: root/nova/version.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-20 08:50:18 +0000
committerGerrit Code Review <review@openstack.org>2013-02-20 08:50:18 +0000
commite37e02870216ea6de130ce3d1b2e8f642de9faf6 (patch)
treed3eef37cf671a7879303d3f693e8621c75377fe3 /nova/version.py
parent512490200e009bce3cb155fcea683e9776d67658 (diff)
parent706a1370056ffccc2c8811fc1ac0679944564ece (diff)
downloadnova-e37e02870216ea6de130ce3d1b2e8f642de9faf6.tar.gz
nova-e37e02870216ea6de130ce3d1b2e8f642de9faf6.tar.xz
nova-e37e02870216ea6de130ce3d1b2e8f642de9faf6.zip
Merge "Use oslo-config-2013.1b4"
Diffstat (limited to 'nova/version.py')
-rw-r--r--nova/version.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/version.py b/nova/version.py
index 722a20e16..d54c112be 100644
--- a/nova/version.py
+++ b/nova/version.py
@@ -31,7 +31,8 @@ def _load_config():
# this module
import ConfigParser
- from nova.openstack.common import cfg
+ from oslo.config import cfg
+
from nova.openstack.common import log as logging
global loaded, NOVA_VENDOR, NOVA_PRODUCT, NOVA_PACKAGE