summaryrefslogtreecommitdiff
path: root/keystonemiddleware/auth_token.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-02-07 08:07:25 +0000
committerGerrit Code Review <review@openstack.org>2015-02-07 08:07:25 +0000
commit77f6fba43388c2daf43ed7ac71df84c51fafee82 (patch)
tree7d0cdd9fc95c5a18741908f9476189f6d52c00b4 /keystonemiddleware/auth_token.py
parent773bdd8c0087d75e8e0d8b162aec9c8e81b2f2ce (diff)
parent4010736efd472ff3160a523cfcc866c7fe04e3ff (diff)
downloadkeystonemiddleware-77f6fba43388c2daf43ed7ac71df84c51fafee82.tar.gz
Merge "Switch from oslo.serialization to oslo_serialization"
Diffstat (limited to 'keystonemiddleware/auth_token.py')
-rw-r--r--keystonemiddleware/auth_token.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/keystonemiddleware/auth_token.py b/keystonemiddleware/auth_token.py
index b816cb9..9d5e9dd 100644
--- a/keystonemiddleware/auth_token.py
+++ b/keystonemiddleware/auth_token.py
@@ -189,7 +189,7 @@ from keystoneclient import discover
from keystoneclient import exceptions
from keystoneclient import session
from oslo.config import cfg
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
from oslo_utils import timeutils
import six
from six.moves import urllib