Merge branch 'master' into dist/eole/2.6.2/master
This commit is contained in:
commit
f57addc2cc
|
@ -326,7 +326,7 @@ maxclients %%redisMaxClients
|
||||||
# limit for maxmemory so that there is some free RAM on the system for slave
|
# limit for maxmemory so that there is some free RAM on the system for slave
|
||||||
# output buffers (but this is not needed if the policy is 'noeviction').
|
# output buffers (but this is not needed if the policy is 'noeviction').
|
||||||
#
|
#
|
||||||
maxmemory %{redisMaxMemory}mb
|
maxmemory %%{redisMaxMemory}mb
|
||||||
|
|
||||||
# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
|
# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
|
||||||
# is reached. You can select among five behaviors:
|
# is reached. You can select among five behaviors:
|
||||||
|
|
|
@ -320,7 +320,7 @@ maxclients %%redisMaxClients
|
||||||
# limit for maxmemory so that there is some free RAM on the system for slave
|
# limit for maxmemory so that there is some free RAM on the system for slave
|
||||||
# output buffers (but this is not needed if the policy is 'noeviction').
|
# output buffers (but this is not needed if the policy is 'noeviction').
|
||||||
#
|
#
|
||||||
maxmemory %{redisMaxMemory}mb
|
maxmemory %%{redisMaxMemory}mb
|
||||||
|
|
||||||
# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
|
# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
|
||||||
# is reached. You can select among five behaviors:
|
# is reached. You can select among five behaviors:
|
||||||
|
|
Loading…
Reference in New Issue