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

Merge commit '09cb4a885f88d30b5108d215dcdaa5163229a230' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2019-04-04 14:34:17 +03:00
parent f812302d62 09cb4a885f
commit 2aa3515fc8
92 changed files with 1560 additions and 1696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/maxscale/config.hh
View File

@ -129,6 +129,7 @@ extern const char CN_HITS[];
extern const char CN_ID[];
extern const char CN_INET[];
extern const char CN_LINKS[];
extern const char CN_LOAD_PERSISTED_CONFIGS[];
extern const char CN_LISTENER[];
extern const char CN_LISTENERS[];
extern const char CN_LOCALHOST_MATCH_WILDCARD_HOST[];
@ -510,6 +511,7 @@ struct MXS_CONFIG
char peer_user[MAX_ADMIN_HOST_LEN]; /**< Username for maxscale-to-maxscale traffic */
char peer_password[MAX_ADMIN_HOST_LEN]; /**< Password for maxscale-to-maxscale traffic */
mxb_log_target_t log_target; /**< Log type */
bool load_persisted_configs; /**< Load persisted configuration files on startup */
};
/**