From 7b3e3d6a13db7bfe0b93056d9a004185e18d6ae3 Mon Sep 17 00:00:00 2001 From: Madelyn Olson Date: Mon, 16 Dec 2019 23:40:19 -0800 Subject: [PATCH] Resolved merge miss --- src/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.c b/src/config.c index 5ff333fec..3d53e656b 100644 --- a/src/config.c +++ b/src/config.c @@ -2166,7 +2166,7 @@ standardConfig configs[] = { createBoolConfig("syslog-enabled", NULL, IMMUTABLE_CONFIG, server.syslog_enabled, 0, NULL, NULL), createBoolConfig("cluster-enabled", NULL, IMMUTABLE_CONFIG, server.cluster_enabled, 0, NULL, NULL), createBoolConfig("appendonly", NULL, MODIFIABLE_CONFIG, server.aof_enabled, 0, NULL, updateAppendonly), - createBoolConfig("cluster-allow-reads-when-down", NULL, MODIFIABLE_CONFIG, server.cluster_allow_reads_when_down, 0, NULL, NULL}, + createBoolConfig("cluster-allow-reads-when-down", NULL, MODIFIABLE_CONFIG, server.cluster_allow_reads_when_down, 0, NULL, NULL), /* String Configs */