Redis 2.6 branch obtained from unstable removing all the cluster related code.

[redis.git] / src / config.c

diff --git a/src/config.c b/src/config.c
index 533a2a572a1cd311edf95c5dec784ef00586c978..71a800a12303d847aa8a3244e1b049cd521c77fd 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -298,13 +298,6 @@ void loadServerConfigFromString(char *config) {
                     err = "Target command name already exists"; goto loaderr;
                 }
             }
-        } else if (!strcasecmp(argv[0],"cluster-enabled") && argc == 2) {
-            if ((server.cluster_enabled = yesnotoi(argv[1])) == -1) {
-                err = "argument must be 'yes' or 'no'"; goto loaderr;
-            }
-        } else if (!strcasecmp(argv[0],"cluster-config-file") && argc == 2) {
-            zfree(server.cluster.configfile);
-            server.cluster.configfile = zstrdup(argv[1]);
         } else if (!strcasecmp(argv[0],"lua-time-limit") && argc == 2) {
             server.lua_time_limit = strtoll(argv[1],NULL,10);
         } else if (!strcasecmp(argv[0],"slowlog-log-slower-than") &&