projects
/
redis.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8996bf7
)
fixed typo in comments
author
Herbert G. Fischer
<hgfischer@sp.r7.com>
Tue, 18 Oct 2011 21:01:30 +0000
(19:01 -0200)
committer
antirez
<antirez@gmail.com>
Mon, 31 Oct 2011 10:13:37 +0000
(11:13 +0100)
redis.conf
patch
|
blob
|
blame
|
history
diff --git
a/redis.conf
b/redis.conf
index e59f184df7cb06c2fdc642aac357a911dac2a579..fdabda06d31bc1bfc8ba9b7c157a1bc54bf78fd7 100644
(file)
--- a/
redis.conf
+++ b/
redis.conf
@@
-139,12
+139,12
@@
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
+# repl
-
timeout 60
################################## SECURITY ###################################