diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-19 18:34:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-19 18:34:50 +0000 |
| commit | e50a957b44d7925cf87375c05098e8ef77b0093f (patch) | |
| tree | 0f50dd76d5c40d024999d0d4d2bc3aa138b67924 /keystone/config.py | |
| parent | 777c2d12eefd66155d85b22db6a284faecc23562 (diff) | |
| parent | 909c44a0fb80a3b4bafb82b0b3b8de7b7bd29826 (diff) | |
| download | keystone-e50a957b44d7925cf87375c05098e8ef77b0093f.tar.gz keystone-e50a957b44d7925cf87375c05098e8ef77b0093f.tar.xz keystone-e50a957b44d7925cf87375c05098e8ef77b0093f.zip | |
Merge "Use oslo-config-2013.1b3"
Diffstat (limited to 'keystone/config.py')
| -rw-r--r-- | keystone/config.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keystone/config.py b/keystone/config.py index f2d8f546..da6582a5 100644 --- a/keystone/config.py +++ b/keystone/config.py @@ -18,9 +18,9 @@ import gettext import os import sys -from keystone.common import logging -from keystone.openstack.common import cfg +from oslo.config import cfg +from keystone.common import logging gettext.install('keystone', unicode=1) |