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/mxs1743_rconn_bitmask.cpp
+++ b/maxscale-system-test/mxs1743_rconn_bitmask.cpp
@ -68,7 +68,7 @@ int main(int argc, char** argv)
    find_field(test.repl->nodes[0], query.c_str(), "connections", master_connections);
    find_field(test.repl->nodes[1], query.c_str(), "connections", slave_connections);

-    test.assert(strcmp(master_connections, slave_connections) == 0,
+    test.expect(strcmp(master_connections, slave_connections) == 0,
                "Master and slave shoud have the same amount of connections: %s != %s",
                master_connections,
                slave_connections);