diff options
Diffstat (limited to 'keystone/middleware')
-rw-r--r-- | keystone/middleware/core.py | 3 | ||||
-rw-r--r-- | keystone/middleware/s3_token.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/keystone/middleware/core.py b/keystone/middleware/core.py index 863ef948..92b179c3 100644 --- a/keystone/middleware/core.py +++ b/keystone/middleware/core.py @@ -17,13 +17,12 @@ import webob.dec from keystone.common import config -from keystone.common import logging from keystone.common import serializer from keystone.common import utils from keystone.common import wsgi from keystone import exception from keystone.openstack.common import jsonutils - +from keystone.openstack.common import log as logging CONF = config.CONF LOG = logging.getLogger(__name__) diff --git a/keystone/middleware/s3_token.py b/keystone/middleware/s3_token.py index b346893b..39678591 100644 --- a/keystone/middleware/s3_token.py +++ b/keystone/middleware/s3_token.py @@ -37,8 +37,8 @@ import httplib import urllib import webob -from keystone.common import logging from keystone.openstack.common import jsonutils +from keystone.openstack.common import log as logging PROTOCOL_NAME = 'S3 Token Authentication' |