diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-27 03:48:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-27 03:48:19 +0000 |
| commit | 057162108a806d387fa5e32f8d900cc0a62b02f7 (patch) | |
| tree | 24b951d65bf95d18445b146a03de74debf35e63f | |
| parent | 49ee4eb8d5ae1e28e3dd6301f2198861d02ed92f (diff) | |
| parent | 6bf25d0759e24a863aad932c5633c30ac6842225 (diff) | |
| download | keystone-057162108a806d387fa5e32f8d900cc0a62b02f7.tar.gz | |
Merge "Fix typo on cache backend module" into stable/icehouse
| -rw-r--r-- | etc/keystone.conf.sample | 2 | ||||
| -rw-r--r-- | keystone/common/config.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample index c5f57bf61..d5b7b391e 100644 --- a/etc/keystone.conf.sample +++ b/etc/keystone.conf.sample @@ -537,7 +537,7 @@ #expiration_time=600 # Dogpile.cache backend module. It is recommended that -# Memcache (dogpile.cache.memcache) or Redis +# Memcache (dogpile.cache.memcached) or Redis # (dogpile.cache.redis) be used in production deployments. # Small workloads (single process) like devstack can use the # dogpile.cache.memory backend. (string value) diff --git a/keystone/common/config.py b/keystone/common/config.py index 155209269..88ec2087a 100644 --- a/keystone/common/config.py +++ b/keystone/common/config.py @@ -249,7 +249,7 @@ FILE_OPTIONS = { # backend. cfg.StrOpt('backend', default='keystone.common.cache.noop', help='Dogpile.cache backend module. It is recommended ' - 'that Memcache (dogpile.cache.memcache) or Redis ' + 'that Memcache (dogpile.cache.memcached) or Redis ' '(dogpile.cache.redis) be used in production ' 'deployments. Small workloads (single process) ' 'like devstack can use the dogpile.cache.memory ' |