Merge branch '2.2' into develop

2018-09-08 18:58:57 +03:00
parent 91acbc0994 bcacdf9358
commit 0e5d827f7a
8 changed files with 141 additions and 22 deletions
--- a/server/modules/routing/avrorouter/avro_main.cc
+++ b/server/modules/routing/avrorouter/avro_main.cc
@ -513,6 +513,8 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE()
            {"start_index", MXS_MODULE_PARAM_COUNT, "1"},
            {"block_size", MXS_MODULE_PARAM_SIZE, "0"},
            {"codec", MXS_MODULE_PARAM_ENUM, "null", MXS_MODULE_OPT_ENUM_UNIQUE, codec_values},
+            {"match", MXS_MODULE_PARAM_REGEX},
+            {"exclude", MXS_MODULE_PARAM_REGEX},
            {MXS_END_MODULE_PARAMS}
        }
    };