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/identity | |
| 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/identity')
| -rw-r--r-- | keystone/identity/backends/ldap.py | 2 | ||||
| -rw-r--r-- | keystone/identity/controllers.py | 3 | ||||
| -rw-r--r-- | keystone/identity/core.py | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/keystone/identity/backends/ldap.py b/keystone/identity/backends/ldap.py index a359c63f..ef3b5d61 100644 --- a/keystone/identity/backends/ldap.py +++ b/keystone/identity/backends/ldap.py @@ -21,12 +21,12 @@ import ldap from keystone import clean from keystone.common import dependency from keystone.common import ldap as common_ldap -from keystone.common import logging from keystone.common import models from keystone.common import utils from keystone import config from keystone import exception from keystone import identity +from keystone.openstack.common import log as logging CONF = config.CONF diff --git a/keystone/identity/controllers.py b/keystone/identity/controllers.py index 8777b1f9..67f3beac 100644 --- a/keystone/identity/controllers.py +++ b/keystone/identity/controllers.py @@ -22,10 +22,9 @@ import urlparse import uuid from keystone.common import controller -from keystone.common import logging from keystone import config from keystone import exception - +from keystone.openstack.common import log as logging CONF = config.CONF DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id diff --git a/keystone/identity/core.py b/keystone/identity/core.py index b2b3eaf0..7fb630e2 100644 --- a/keystone/identity/core.py +++ b/keystone/identity/core.py @@ -18,10 +18,10 @@ from keystone import clean from keystone.common import dependency -from keystone.common import logging from keystone.common import manager from keystone import config from keystone import exception +from keystone.openstack.common import log as logging CONF = config.CONF |