summaryrefslogtreecommitdiff
path: root/doc/source
diff options
context:
space:
mode:
authorxingzhou <xingzhou@cn.ibm.com>2013-06-04 01:44:09 -0400
committerxingzhou <xingzhou@cn.ibm.com>2013-06-20 01:33:56 -0400
commitabe6781913a7a4e376c0798e2e962ef16e9a48e6 (patch)
treed120da67518a751492cce4ecefa18e6816affbd0 /doc/source
parenteeefb784f24c37d5f56a421e1ccc911cace9385e (diff)
downloadpython-keystoneclient-abe6781913a7a4e376c0798e2e962ef16e9a48e6.tar.gz
Change memcache config entry name in Keystone to be consistent with Oslo
Currently, Keystone-Client is using 'memcache_servers' config option to store the memcache server info, while in OSLO project, it is using 'memcached_servers' to config the same option. It is better to change keystone-client's 'memcache_servers' to 'memcached_servers' to keep consistent between these two projects. Change-Id: I93ca0aa368f95a3ccf6de6984262057e61f75ffe Fixes: Bug 1172793
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/middlewarearchitecture.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/source/middlewarearchitecture.rst b/doc/source/middlewarearchitecture.rst
index 894d40d..f5fbae7 100644
--- a/doc/source/middlewarearchitecture.rst
+++ b/doc/source/middlewarearchitecture.rst
@@ -134,7 +134,7 @@ a WSGI component. Example for the auth_token middleware::
;Uncomment next line to use Swift MemcacheRing
;cache = swift.cache
;Uncomment next line and check ip:port to use memcached to cache tokens
- ;memcache_servers = 127.0.0.1:11211
+ ;memcached_servers = 127.0.0.1:11211
;Uncomment next 2 lines to turn on memcache protection
;memcache_security_strategy = ENCRYPT
;memcache_secret_key = change_me
@@ -203,7 +203,7 @@ invalidated tokens may continue to work if they are still in the token cache,
so token_cache_time is configurable. For larger deployments, the middleware
also supports memcache based caching.
-* ``memcache_servers``: (optonal) if defined, the memcache server(s) to use for
+* ``memcached_servers``: (optonal) if defined, the memcache server(s) to use for
cacheing. It will be ignored if Swift MemcacheRing is used instead.
* ``token_cache_time``: (optional, default 300 seconds) Set to -1 to disable
caching completely.