Merge branch '2.2' into develop

2018-05-25 12:15:58 +03:00
parent 0848bedf34 cd303df35c
commit 40b31621c8
3 changed files with 16 additions and 4 deletions
--- a/maxscale-system-test/testconnections.cpp
+++ b/maxscale-system-test/testconnections.cpp
@ -642,8 +642,8 @@ void TestConnections::init_maxscale(int m)
                          "chmod a+x %s;"
                          "%s"
                          "iptables -F INPUT;"
-                          "truncate -s 0 %s/maxscale.log;"
-                          "truncate -s 0 %s/maxscale1.log;"
+                          "rm -f %s/maxscale.log;"
+                          "rm -f %s/maxscale1.log;"
                          "rm -rf /tmp/core* /dev/shm/* /var/lib/maxscale/maxscale.cnf.d/ /var/lib/maxscale/*;"
                          "%s",
                          maxscales->access_homedir[m],