summaryrefslogtreecommitdiff
path: root/nova/context.py
diff options
context:
space:
mode:
authorTomofumi Hayashi <s1061123@gmail.com>2015-02-14 04:40:41 +0900
committerTomofumi Hayashi <s1061123@gmail.com>2015-02-14 04:42:15 +0900
commit24fd271994907f669ad9f38e7c1de5bc0ce6c52a (patch)
tree0e9716579a259ed95b0117357ab26118d833cef0 /nova/context.py
parent1935fa87e19fbdf1bcac7aaea6360cb38e976b77 (diff)
downloadnova-24fd271994907f669ad9f38e7c1de5bc0ce6c52a.tar.gz
Replace oslo-incubator with oslo_context
openstack.common.context is currently moved out of the incubator to a standalone project, hence replace it with oslo_context in nova. Change-Id: I6cbf5d719f33072a5a871c250760512a439a7daf Closes-Bug: #1210261
Diffstat (limited to 'nova/context.py')
-rw-r--r--nova/context.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/context.py b/nova/context.py
index 622f424d73..f5a339f249 100644
--- a/nova/context.py
+++ b/nova/context.py
@@ -21,11 +21,11 @@ import copy
from keystoneclient import auth
from keystoneclient import service_catalog
+from oslo_context import context
from oslo_utils import timeutils
import six
from nova import exception
-from nova.openstack.common import context
from nova.i18n import _, _LW
from nova.openstack.common import local
from nova.openstack.common import log as logging