diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-08-15 21:42:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-08-15 21:42:32 +0000 |
| commit | 049c5c7159ba88f584c832e6b1a87d6bee9c31d7 (patch) | |
| tree | 95c761876ebd90b6466ec338246e2fa4cc5ecf1f /keystone/auth | |
| parent | 1b4f0a5ec848af94e322a8f55deb52223c94b62a (diff) | |
| parent | 0c2fc69ba15d8a0a0c045294495503e451501ac9 (diff) | |
| download | keystone-049c5c7159ba88f584c832e6b1a87d6bee9c31d7.tar.gz keystone-049c5c7159ba88f584c832e6b1a87d6bee9c31d7.tar.xz keystone-049c5c7159ba88f584c832e6b1a87d6bee9c31d7.zip | |
Merge "Refactor Keystone to use unified logging from Oslo"
Diffstat (limited to 'keystone/auth')
| -rw-r--r-- | keystone/auth/controllers.py | 2 | ||||
| -rw-r--r-- | keystone/auth/plugins/password.py | 2 | ||||
| -rw-r--r-- | keystone/auth/plugins/token.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/keystone/auth/controllers.py b/keystone/auth/controllers.py index d1bd764f..6add068e 100644 --- a/keystone/auth/controllers.py +++ b/keystone/auth/controllers.py @@ -17,12 +17,12 @@ from keystone.common import controller from keystone.common import dependency -from keystone.common import logging from keystone.common import wsgi from keystone import config from keystone import exception from keystone import identity from keystone.openstack.common import importutils +from keystone.openstack.common import log as logging from keystone import token from keystone import trust diff --git a/keystone/auth/plugins/password.py b/keystone/auth/plugins/password.py index f3cfeba8..66c6d05b 100644 --- a/keystone/auth/plugins/password.py +++ b/keystone/auth/plugins/password.py @@ -15,9 +15,9 @@ # under the License. from keystone import auth -from keystone.common import logging from keystone import exception from keystone import identity +from keystone.openstack.common import log as logging METHOD_NAME = 'password' diff --git a/keystone/auth/plugins/token.py b/keystone/auth/plugins/token.py index 720eccac..b82c0311 100644 --- a/keystone/auth/plugins/token.py +++ b/keystone/auth/plugins/token.py @@ -15,9 +15,9 @@ # under the License. from keystone import auth -from keystone.common import logging from keystone.common import wsgi from keystone import exception +from keystone.openstack.common import log as logging from keystone import token |