INCRBYFLOAT implementation

[redis.git] / redis.conf

diff --git a/redis.conf b/redis.conf
index e59f184df7cb06c2fdc642aac357a911dac2a579..6663a4ec89da056b87ab9a8466b2cd6f59e7a08e 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -37,7 +37,7 @@ port 6379
 # unixsocketperm 755
 
 # Close the connection after a client is idle for N seconds (0 to disable)
-timeout 300
+timeout 0
 
 # Set server verbosity to 'debug'
 # it can be one of:
@@ -139,12 +139,16 @@ slave-serve-stale-data yes
 # this interval with the repl_ping_slave_period option. The default value is 10
 # seconds.
 #
-# repl_ping_slave_period 10
+# 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
+# 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
+# every time there is low traffic between the master and the slave.
+#
+# repl-timeout 60
 
 ################################## SECURITY ###################################