summaryrefslogtreecommitdiffstats
path: root/keystonemiddleware-moon/keystonemiddleware/openstack/common
diff options
context:
space:
mode:
authorasteroide <thomas.duval@orange.com>2015-09-24 14:39:09 +0200
committerasteroide <thomas.duval@orange.com>2015-09-24 14:39:09 +0200
commit0be7a3d4e0647dc0d94a34e4fc2f8c364de46602 (patch)
tree14214bb0bbf2430b6ee0df387ddbdbf13c4c4d63 /keystonemiddleware-moon/keystonemiddleware/openstack/common
parente35decd4e989773c96a9abb263257291bd51ae1e (diff)
Update code from KeystoneMiddleware Github repository (Master).
Change-Id: Id28c5bf48b3dbb6c8a08e66411b5785029f6857d
Diffstat (limited to 'keystonemiddleware-moon/keystonemiddleware/openstack/common')
-rw-r--r--keystonemiddleware-moon/keystonemiddleware/openstack/common/memorycache.py6
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))]