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

This commit is contained in:
2018-05-14 16:04:57 +02:00

View File

@ -488,7 +488,7 @@ aof-load-truncated yes
# Set it to 0 or a negative value for unlimited execution without warnings.
lua-time-limit 5000
%if %%getVar('redisMode','Local') == "Cluster" and %%getVar('redisRole','Node') == 'Leader'
%if %%getVar('redisMode','Local') == "Cluster"
################################ REDIS CLUSTER ###############################
#
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++