Merge branch 'master' into dist/eole/2.6.2/master

This commit is contained in:
Teddy Cornaut 2018-09-06 09:24:22 +02:00
commit f57addc2cc
2 changed files with 2 additions and 2 deletions

View File

@ -326,7 +326,7 @@ maxclients %%redisMaxClients
# 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').
#
maxmemory %{redisMaxMemory}mb
maxmemory %%{redisMaxMemory}mb
# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
# is reached. You can select among five behaviors:

View File

@ -320,7 +320,7 @@ maxclients %%redisMaxClients
# 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').
#
maxmemory %{redisMaxMemory}mb
maxmemory %%{redisMaxMemory}mb
# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
# is reached. You can select among five behaviors: