Develop merge

2017-06-29 15:34:22 +02:00
parent 4993fd683c
commit cb57e10761
122 changed files with 16937 additions and 1627 deletions
--- a/maxscale-system-test/testconnections.cpp
+++ b/maxscale-system-test/testconnections.cpp
@ -1672,7 +1672,7 @@ void *timeout_thread( void *ptr )
        Test->timeout--;
    }
    Test->tprintf("\n **** Timeout! *** \n");
-    delete Test;
+    Test->~TestConnections();
    exit(250);
 }