Merge branch '2.1' into 2.2

2017-12-12 13:23:02 +02:00
parent 6485365b3b 7ebd487ef3
commit 79afaa447e
97 changed files with 5945 additions and 361 deletions
--- a/maxscale-system-test/crash_out_of_files.cpp
+++ b/maxscale-system-test/crash_out_of_files.cpp
@ -44,7 +44,7 @@ int main(int argc, char *argv[])
    Test->repl->close_connections();
    Test->stop_timeout();

-    Test->check_log_err(0, (char *) "refresh rate limit exceeded", false);
+    Test->check_log_err(0, (char *) "Refresh rate limit exceeded", false);
    Test->check_maxscale_alive(0);
    int rval = Test->global_result;
    delete Test;