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
59f2e7c1
Commit
59f2e7c1
authored
Nov 16, 2016
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
cfdb3a22
b399288f
Changes
1
Hide whitespace changes
Inline
Side-by-side
redis.conf
View file @
59f2e7c1
...
@@ -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 maste
e
r.
# "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:
...
...
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