diff options
| author |   Ruan HE <ruan.he@orange.com> | 2015-09-24 12:58:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-09-24 12:58:47 +0000 |
| commit | 49325d99acfadaadfad99c596c4ada6b5ec849de (patch) | |
| tree | 8aa122c4edb6f9527651e6c3abf65f416c288c85 /keystonemiddleware-moon/keystonemiddleware/openstack/common/memorycache.py | |
| parent | 17682330bc068a964bed3ec1c5d43677c09d6d4f (diff) | |
| parent | 0be7a3d4e0647dc0d94a34e4fc2f8c364de46602 (diff) | |
Merge "Update code from KeystoneMiddleware Github repository (Master)."
Diffstat (limited to 'keystonemiddleware-moon/keystonemiddleware/openstack/common/memorycache.py')
| -rw-r--r-- | keystonemiddleware-moon/keystonemiddleware/openstack/common/memorycache.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/keystonemiddleware-moon/keystonemiddleware/openstack/common/memorycache.py b/keystonemiddleware-moon/keystonemiddleware/openstack/common/memorycache.py index f793c937..e72c26df 100644 --- a/keystonemiddleware-moon/keystonemiddleware/openstack/common/memorycache.py +++ b/keystonemiddleware-moon/keystonemiddleware/openstack/common/memorycache.py @@ -18,8 +18,8 @@ import copy -from oslo.config import cfg -from oslo.utils import timeutils +from oslo_config import cfg +from oslo_utils import timeutils memcache_opts = [ cfg.ListOpt('memcached_servers', @@ -31,7 +31,7 @@ CONF.register_opts(memcache_opts) def list_opts(): - """Entry point for oslo.config-generator.""" + """Entry point for oslo-config-generator.""" return [(None, copy.deepcopy(memcache_opts))] |