Merge branch '2.2' into 2.3

2018-10-31 08:53:50 +02:00
parent ce35b0d541 47e7595a08
commit 7deed35587
12 changed files with 73 additions and 167 deletions
--- a/maxscale-system-test/mxs1743_rconn_bitmask.cpp
+++ b/maxscale-system-test/mxs1743_rconn_bitmask.cpp
@ -46,6 +46,7 @@ int main(int argc, char** argv)

    test.tprintf("Syncing slaves");
    test.stop_timeout();
+    test.repl->fix_replication();
    test.repl->sync_slaves();
    test.set_timeout(60);