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

2018-05-14 15:04:00 +02:00 · 2018-05-14 15:04:00 +02:00 · 64e42d7a97
parent 44bc50a2ba e8d3fcd104
commit 64e42d7a97
1 changed files with 1 additions and 1 deletions
--- a/tmpl/redis.conf
+++ b/tmpl/redis.conf
@ -259,7 +259,7 @@ dir /var/lib/redis
 # 150k passwords per second against a good box. This means that you should
 # use a very strong password otherwise it will be very easy to break.
 #
-#requirepass %%redisMasterPassword
+#requirepass redisMasterPassword

 # Command renaming.
 #