Merge branch '2.2' into develop

2018-09-20 12:16:55 +03:00
parent 795796c8a2 8c2f6aafcc
commit d8d0b1a29c
9 changed files with 19 additions and 9 deletions
--- a/maxscale-system-test/different_size_rwsplit.cpp
+++ b/maxscale-system-test/different_size_rwsplit.cpp
@ -19,6 +19,7 @@ int main(int argc, char* argv[])

    different_packet_size(Test, false);

+    Test->set_timeout(180);
    Test->repl->sync_slaves();
    Test->check_maxscale_alive(0);
    int rval = Test->global_result;