diff options
| author |   Ruan HE <ruan.he@orange.com> | 2016-06-09 08:12:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-09 08:12:34 +0000 |
| commit | 4bc079a2664f9a407e332291f34d174625a9d5ea (patch) | |
| tree | 7481cd5d0a9b3ce37c44c797a1e0d39881221cbe /keystone-moon/keystone/server/eventlet.py | |
| parent | 2f179c5790fbbf6144205d3c6e5089e6eb5f048a (diff) | |
| parent | 2e7b4f2027a1147ca28301e4f88adf8274b39a1f (diff) | |
Merge "Update Keystone core to Mitaka."
Diffstat (limited to 'keystone-moon/keystone/server/eventlet.py')
| -rw-r--r-- | keystone-moon/keystone/server/eventlet.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keystone-moon/keystone/server/eventlet.py b/keystone-moon/keystone/server/eventlet.py index 243f0234..e688baed 100644 --- a/keystone-moon/keystone/server/eventlet.py +++ b/keystone-moon/keystone/server/eventlet.py @@ -32,12 +32,12 @@ import pbr.version oslo_i18n.enable_lazy() +from keystone.common import config from keystone.common import environment from keystone.common import utils -from keystone import config from keystone.i18n import _ from keystone.server import common -from keystone import service as keystone_service +from keystone.version import service as keystone_service CONF = cfg.CONF |