Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
7b3e3d6a
Commit
7b3e3d6a
authored
Dec 16, 2019
by
Madelyn Olson
Browse files
Resolved merge miss
parent
12caffee
Changes
1
Show whitespace changes
Inline
Side-by-side
src/config.c
View file @
7b3e3d6a
...
@@ -2166,7 +2166,7 @@ standardConfig configs[] = {
...
@@ -2166,7 +2166,7 @@ standardConfig configs[] = {
createBoolConfig
(
"syslog-enabled"
,
NULL
,
IMMUTABLE_CONFIG
,
server
.
syslog_enabled
,
0
,
NULL
,
NULL
),
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
(
"cluster-enabled"
,
NULL
,
IMMUTABLE_CONFIG
,
server
.
cluster_enabled
,
0
,
NULL
,
NULL
),
createBoolConfig
(
"appendonly"
,
NULL
,
MODIFIABLE_CONFIG
,
server
.
aof_enabled
,
0
,
NULL
,
updateAppendonly
),
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 */
/* String Configs */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment