Merge branch '2.2' into develop

2018-10-02 10:18:09 +03:00
parent 6b8443aba6 dad4f55ee6
commit 75f9921ca2
16 changed files with 125 additions and 135 deletions
--- a/maxscale-system-test/fail_switch_rejoin_common.cpp
+++ b/maxscale-system-test/fail_switch_rejoin_common.cpp
@ -23,7 +23,7 @@ void get_output(TestConnections& test)
        test.tprintf("MaxScale output:");
    }
    output = test.maxscales->ssh_node_output(0,
-                                             "cat /var/log/maxscale/maxscale.log && "
+                                             "cat /var/log/maxscale/maxscale.log  | tee -a /var/log/maxscale/maxscale_backup.log && "
                                             "sudo truncate -s 0 /var/log/maxscale/maxscale.log",
                                             true,
                                             &ec);