Commit 59f2e7c1 authored by antirez's avatar antirez
Browse files

Merge branch 'unstable' of github.com:/antirez/redis into unstable

parents cfdb3a22 b399288f
...@@ -448,7 +448,7 @@ slave-priority 100 ...@@ -448,7 +448,7 @@ slave-priority 100
# offers this information, which is used, among other tools, by # offers this information, which is used, among other tools, by
# Redis Sentinel in order to discover slave instances. # Redis Sentinel in order to discover slave instances.
# Another place where this info is available is in the output of the # Another place where this info is available is in the output of the
# "ROLE" command of a masteer. # "ROLE" command of a master.
# #
# The listed IP and address normally reported by a slave is obtained # The listed IP and address normally reported by a slave is obtained
# in the following way: # in the following way:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment