Merge branch 'unstable' into unstable-zset

[redis.git] / src / config.c

diff --git a/src/config.c b/src/config.c
index fec72a45e8026cc043eeacc8dda7b04c87d6b52a..f6c6ad68fef93efe6868fc90427b7211b5012105 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -289,6 +289,10 @@ void loadServerConfig(char *filename) {
                     err = "Target command name already exists"; goto loaderr;
                 }
             }
                     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 {
             err = "Bad directive or wrong number of arguments"; goto loaderr;
         }
         } else {
             err = "Bad directive or wrong number of arguments"; goto loaderr;
         }