summaryrefslogtreecommitdiffstats
path: root/nova/service.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-02-03 19:50:45 +0000
committerGerrit Code Review <review@openstack.org>2012-02-03 19:50:45 +0000
commitcd0df1e8b09d1ccf17e6fabed3aaafc7356b9486 (patch)
tree6b9e1fa5ec898393a6a6fbaf0da888f6e0c8f31e /nova/service.py
parent30c363beebc9c17897997c5622802e884d0afda6 (diff)
parent9871c5f963b6d98240635a9a447d14d46133c910 (diff)
downloadnova-cd0df1e8b09d1ccf17e6fabed3aaafc7356b9486.tar.gz
nova-cd0df1e8b09d1ccf17e6fabed3aaafc7356b9486.tar.xz
nova-cd0df1e8b09d1ccf17e6fabed3aaafc7356b9486.zip
Merge "Move cfg to nova.openstack.common"
Diffstat (limited to 'nova/service.py')
-rw-r--r--nova/service.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/service.py b/nova/service.py
index 56f706c4b..fc62a3b08 100644
--- a/nova/service.py
+++ b/nova/service.py
@@ -25,12 +25,12 @@ import os
import eventlet
import greenlet
-from nova.common import cfg
from nova import context
from nova import db
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
from nova import version