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
24c53925
Unverified
Commit
24c53925
authored
Aug 05, 2020
by
Itamar Haber
Committed by
GitHub
Aug 05, 2020
Browse files
Merge pull request #7092 from itamarhaber/fix-5629
Prevents default save configuration being reset...
parents
1aa31e4d
a063c8c1
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/server.c
View file @
24c53925
...
@@ -5160,7 +5160,6 @@ int main(int argc, char **argv) {
...
@@ -5160,7 +5160,6 @@ int main(int argc, char **argv) {
"Sentinel needs config file on disk to save state. Exiting..."
);
"Sentinel needs config file on disk to save state. Exiting..."
);
exit
(
1
);
exit
(
1
);
}
}
resetServerSaveParams
();
loadServerConfig
(
configfile
,
options
);
loadServerConfig
(
configfile
,
options
);
sdsfree
(
options
);
sdsfree
(
options
);
}
}
...
...
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