diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-02-10 01:31:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-02-10 01:31:41 +0000 |
| commit | 8223e3d49a22cb23ac2925e49f0ce885e1c34e59 (patch) | |
| tree | 8f50134534fd0a405ed7c871ee82d05486bea4a6 | |
| parent | 2b98d531841da649ffc8dbf79495cf6942f98cad (diff) | |
| parent | a0e05d5fa8ee777129f9e50a911daa685e5653b8 (diff) | |
| download | keystonemiddleware-8223e3d49a22cb23ac2925e49f0ce885e1c34e59.tar.gz | |
Merge "Use oslo.context instead of incubator code"
| -rw-r--r-- | keystonemiddleware/audit.py | 2 | ||||
| -rw-r--r-- | requirements.txt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/keystonemiddleware/audit.py b/keystonemiddleware/audit.py index 1c3b602..5e230be 100644 --- a/keystonemiddleware/audit.py +++ b/keystonemiddleware/audit.py @@ -25,6 +25,7 @@ import os.path import sys from oslo_config import cfg +from oslo_context import context try: import oslo.messaging messaging = True @@ -35,7 +36,6 @@ from pycadf.audit import api import webob.dec from keystonemiddleware.i18n import _LE, _LI -from keystonemiddleware.openstack.common import context _LOG = None diff --git a/requirements.txt b/requirements.txt index 96e04c3..ab06b08 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,7 @@ Babel>=1.3 iso8601>=0.1.9 oslo.config>=1.6.0 # Apache-2.0 +oslo.context>=0.1.0 # Apache-2.0 oslo.i18n>=1.3.0 # Apache-2.0 oslo.serialization>=1.2.0 # Apache-2.0 oslo.utils>=1.2.0 # Apache-2.0 |