diff options
| author | Madelyn Olson <matolson@amazon.com> | 2019-12-16 23:40:19 -0800 |
|---|---|---|
| committer | Madelyn Olson <matolson@amazon.com> | 2019-12-16 23:40:19 -0800 |
| commit | 7b3e3d6a13db7bfe0b93056d9a004185e18d6ae3 (patch) | |
| tree | fcb35a112614c059b366427a25545934c3bab7f2 | |
| parent | 12caffee6159c6fc2bdf226a224a6c5ed67a42cb (diff) | |
| download | redis-7b3e3d6a13db7bfe0b93056d9a004185e18d6ae3.tar.gz | |
Resolved merge miss
| -rw-r--r-- | src/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |