redis.conf updated: repl-timeout now uesd by masters as well.

This commit is contained in:
antirez 2013-05-27 11:24:05 +02:00
parent 3c82c85fcf
commit c9b55a29d6

View File

@ -203,8 +203,11 @@ slave-read-only yes
# #
# repl-ping-slave-period 10 # repl-ping-slave-period 10
# The following option sets a timeout for both Bulk transfer I/O timeout and # The following option sets the replication timeout for:
# master data or ping response timeout. The default value is 60 seconds. #
# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
# 2) Master timeout from the point of view of slaves (data, pings).
# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
# #
# It is important to make sure that this value is greater than the value # It is important to make sure that this value is greater than the value
# specified for repl-ping-slave-period otherwise a timeout will be detected # specified for repl-ping-slave-period otherwise a timeout will be detected