summaryrefslogtreecommitdiffstats
path: root/nova/quota.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/quota.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/quota.py')
-rw-r--r--nova/quota.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/quota.py b/nova/quota.py
index 1856c97c1..3361154dd 100644
--- a/nova/quota.py
+++ b/nova/quota.py
@@ -20,14 +20,14 @@
import datetime
+from oslo.config import cfg
+
from nova import db
from nova import exception
-from nova.openstack.common import cfg
from nova.openstack.common import importutils
from nova.openstack.common import log as logging
from nova.openstack.common import timeutils
-
LOG = logging.getLogger(__name__)
quota_opts = [