Merge "Last sync from oslo-incubator"

This commit is contained in:
Jenkins
2015-11-14 06:37:52 +00:00
committed by Gerrit Code Review

View File

@@ -18,6 +18,7 @@
import copy
from debtcollector import removals
from oslo_config import cfg
from oslo_utils import timeutils
@@ -30,6 +31,11 @@ CONF = cfg.CONF
CONF.register_opts(memcache_opts)
# Indicate that this module is deprecated for removal and oslo.cache should
# be used instead.
removals.removed_module(__name__, 'oslo.cache')
def list_opts():
"""Entry point for oslo-config-generator."""
return [(None, copy.deepcopy(memcache_opts))]