Merge branch '2.2' into 2.3

This commit is contained in:
Markus Mäkelä
2018-10-31 08:53:50 +02:00
12 changed files with 73 additions and 167 deletions

View File

@ -303,8 +303,7 @@ const MXS_MODULE_PARAM config_service_params[] =
{CN_AUTH_ALL_SERVERS, MXS_MODULE_PARAM_BOOL, "false"},
{CN_STRIP_DB_ESC, MXS_MODULE_PARAM_BOOL, "true"},
{CN_LOCALHOST_MATCH_WILDCARD_HOST, MXS_MODULE_PARAM_BOOL, "true"},
{CN_VERSION_STRING, MXS_MODULE_PARAM_STRING,
DEFAULT_VERSION_STRING},
{CN_VERSION_STRING, MXS_MODULE_PARAM_STRING},
{CN_FILTERS, MXS_MODULE_PARAM_STRING},
{CN_WEIGHTBY, MXS_MODULE_PARAM_STRING},
{CN_LOG_AUTH_WARNINGS, MXS_MODULE_PARAM_BOOL, "true"},