summaryrefslogtreecommitdiffstats
path: root/keystone/assignment/backends
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-08-15 21:42:32 +0000
committerGerrit Code Review <review@openstack.org>2013-08-15 21:42:32 +0000
commit049c5c7159ba88f584c832e6b1a87d6bee9c31d7 (patch)
tree95c761876ebd90b6466ec338246e2fa4cc5ecf1f /keystone/assignment/backends
parent1b4f0a5ec848af94e322a8f55deb52223c94b62a (diff)
parent0c2fc69ba15d8a0a0c045294495503e451501ac9 (diff)
downloadkeystone-049c5c7159ba88f584c832e6b1a87d6bee9c31d7.tar.gz
keystone-049c5c7159ba88f584c832e6b1a87d6bee9c31d7.tar.xz
keystone-049c5c7159ba88f584c832e6b1a87d6bee9c31d7.zip
Merge "Refactor Keystone to use unified logging from Oslo"
Diffstat (limited to 'keystone/assignment/backends')
-rw-r--r--keystone/assignment/backends/ldap.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/keystone/assignment/backends/ldap.py b/keystone/assignment/backends/ldap.py
index 718d38c3..45ce6432 100644
--- a/keystone/assignment/backends/ldap.py
+++ b/keystone/assignment/backends/ldap.py
@@ -23,11 +23,11 @@ from keystone import assignment
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 import config
from keystone import exception
from keystone.identity.backends import ldap as ldap_identity
+from keystone.openstack.common import log as logging
CONF = config.CONF