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

This commit is contained in:
Philippe Caseiro 2018-05-14 16:04:57 +02:00
commit 5f1c564aba
1 changed files with 1 additions and 1 deletions

View File

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