summaryrefslogtreecommitdiff
path: root/redis.conf
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2011-10-31 11:13:28 +0100
committerantirez <antirez@gmail.com>2011-10-31 11:13:28 +0100
commit8996bf77204b6084796608ebad3b1688212d8bfc (patch)
tree696cfedb4fc2e9547cb2c398ace83559ce0c9f84 /redis.conf
parent58732c23d53d6fc652668a516556ea182b0ed0f8 (diff)
downloadredis-8996bf77204b6084796608ebad3b1688212d8bfc.tar.gz
7c6da73
Diffstat (limited to 'redis.conf')
-rw-r--r--redis.conf11
1 files changed, 11 insertions, 0 deletions
diff --git a/redis.conf b/redis.conf
index 1138f2fb3..e59f184df 100644
--- a/redis.conf
+++ b/redis.conf
@@ -135,6 +135,17 @@ dir ./
#
slave-serve-stale-data yes
+# Slaves send PINGs to server in a predefined interval. It's possible to change
+# this interval with the repl_ping_slave_period option. The default value is 10
+# seconds.
+#
+# repl_ping_slave_period 10
+
+# The following option sets a timeout for both Bulk transfer I/O timeout and
+# master data or ping response timeout. The default value is 60 seconds.
+#
+# repl_timeout 60
+
################################## SECURITY ###################################
# Require clients to issue AUTH <PASSWORD> before processing any other