diff options
| author | antirez <antirez@gmail.com> | 2016-11-17 09:37:03 +0100 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2016-11-17 09:37:03 +0100 |
| commit | 8fb3ad244474612d8ba53a6a7ba715a325538371 (patch) | |
| tree | 0add79dc552df1d13bb578dea52351af59285a11 /redis.conf | |
| parent | 59f2e7c16259ba22e75d52c2bd486e56bbbf9a6e (diff) | |
| parent | 28c96d73b2e157a37465560bc421280d17005708 (diff) | |
| download | redis-8fb3ad244474612d8ba53a6a7ba715a325538371.tar.gz | |
Merge branch 'psync2' into unstable
Diffstat (limited to 'redis.conf')
| -rw-r--r-- | redis.conf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/redis.conf b/redis.conf index 3a66f23d4..adc09020c 100644 --- a/redis.conf +++ b/redis.conf @@ -402,6 +402,10 @@ repl-disable-tcp-nodelay no # need to elapse, starting from the time the last slave disconnected, for # the backlog buffer to be freed. # +# Note that slaves never free the backlog for timeout, since they may be +# promoted to masters later, and should be able to correctly "partially +# resynchronize" with the slaves: hence they should always accumulate backlog. +# # A value of 0 means to never release the backlog. # # repl-backlog-ttl 3600 |