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
31ac3760
Commit
31ac3760
authored
Mar 05, 2013
by
antirez
Browse files
Cluster: slaveof not allowed in redis.conf as well.
parent
b7d085fc
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/config.c
View file @
31ac3760
...
@@ -438,6 +438,12 @@ void loadServerConfigFromString(char *config) {
...
@@ -438,6 +438,12 @@ void loadServerConfigFromString(char *config) {
sdsfreesplitres
(
argv
,
argc
);
sdsfreesplitres
(
argv
,
argc
);
}
}
sdsfreesplitres
(
lines
,
totlines
);
sdsfreesplitres
(
lines
,
totlines
);
/* Sanity checks. */
if
(
server
.
cluster_enabled
&&
server
.
masterhost
)
{
err
=
"slaveof directive not allowed in cluster mode"
;
goto
loaderr
;
}
return
;
return
;
loaderr:
loaderr:
...
...
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