Commit 31ac3760 authored by antirez's avatar antirez
Browse files

Cluster: slaveof not allowed in redis.conf as well.

parent b7d085fc
...@@ -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:
......
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