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_multimaster.cpp
+++ b/maxscale-system-test/mysqlmon_multimaster.cpp
@ -84,7 +84,7 @@ void check_group(TestConnections& test, const char* server, int expected_group)
        }
    }

-    test.assert(found_group == expected_group,
+    test.expect(found_group == expected_group,
                "Server '%s', expected group '%d', not '%d'",
                server,
                expected_group,