Merge remote-tracking branch 'origin/unstable' into unstable

This commit is contained in:
antirez 2011-11-22 14:27:53 +01:00
commit 1b2962c61f

View File

@ -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 data data, or the
# still reply to client requests, possibly with out of date 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