Remove ambiguity in memcache_servers documentation

Code Issues Proposed changes

The documentation could be understood like the following:
memcache_servers from memcache.conf is always used if set, even if
memcache_servers in proxy-server.conf is set.
This is clearly not the case, as proxy-server.conf has a higher priority
if it memcache_servers is set there.
Change-Id: I967c7e80796a0e296c5c65bd097df1669d16203e

This commit is contained in:

Vincent Untz

2012年06月28日 16:09:10 +02:00

parent c67e56848c

commit 1125368624

2 changed files with 2 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2
etc/proxy-server.conf-sample

View File

@@ -135,7 +135,7 @@ use = egg:swift#memcache

# set log_level = INFO

# set log_headers = False

# set log_address = /dev/log

# Default for memcache_servers is to try to read the property from

# If not set here, the value for memcache_servers will be read from

# memcache.conf (see memcache.conf-sample) or lacking that file, it will

# default to the value below. You can specify multiple servers separated with

# commas, as in: 10.1.2.3:11211,10.1.2.4:11211

Remove ambiguity in memcache_servers documentation

2 etc/proxy-server.conf-sample Unescape Escape View File

2
etc/proxy-server.conf-sample

View File