Merge branch '2.2' into develop

2018-09-10 12:29:00 +03:00
parent 03017c6aad 6279ab350c
commit edd5ddcc88
63 changed files with 226 additions and 226 deletions
--- a/maxscale-system-test/mysqlmon_switchover.cpp
+++ b/maxscale-system-test/mysqlmon_switchover.cpp
@ -95,7 +95,7 @@ void expect(TestConnections& test, const char* zServer, const StringSet& expecte

    if (found != expected)
    {
-        test.assert(false, "Found states are not the same as the expected ones.");
+        test.expect(false, "Found states are not the same as the expected ones.");
        ++test.global_result;
    }