hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.1' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2017-07-31 15:57:05 +03:00
parent 39629c412d 95c254a8b0
commit 3eb99139f5
27 changed files with 389 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/monitor/galeramon/galeramon.c
View File

@ -85,7 +85,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
{"disable_master_failback", MXS_MODULE_PARAM_BOOL, "false"},
{"available_when_donor", MXS_MODULE_PARAM_BOOL, "false"},
{"disable_master_role_setting", MXS_MODULE_PARAM_BOOL, "false"},
{"root_node_as_master", MXS_MODULE_PARAM_BOOL, "true"},
{"root_node_as_master", MXS_MODULE_PARAM_BOOL, "false"},
{"use_priority", MXS_MODULE_PARAM_BOOL, "false"},
{
"script",