Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
1b2962c6
Commit
1b2962c6
authored
Nov 22, 2011
by
antirez
Browse files
Merge remote-tracking branch 'origin/unstable' into unstable
parents
1bcfa0f6
4e5f63a6
Changes
1
Hide whitespace changes
Inline
Side-by-side
redis.conf
View file @
1b2962c6
...
...
@@ -126,7 +126,7 @@ dir ./
# is still in progress, the slave can act in two different ways:
#
# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
# still reply to client requests, possibly with out of dat
a
data, or the
# still reply to client requests, possibly with out of dat
e
data, or the
# data set may just be empty if this is the first synchronization.
#
# 2) if slave-serve-stale data is set to 'no' the slave will reply with
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment