summaryrefslogtreecommitdiffstats
path: root/nova/test.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/test.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/test.py')
-rw-r--r--nova/test.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/test.py b/nova/test.py
index f8e9c390f..7fe4b4abb 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -33,10 +33,10 @@ import mox
import nose.plugins.skip
import stubout
-from nova.common import cfg
from nova import flags
import nova.image.fake
from nova import log
+from nova.openstack.common import cfg
from nova import utils
from nova import service
from nova.testing.fake import rabbit