Merge branch '2.2' into develop

2018-06-20 10:26:29 +03:00
parent bc5acafa64 980caa5be5
commit 6278f27ab6
12 changed files with 212 additions and 147 deletions
--- a/maxscale-system-test/testconnections.cpp
+++ b/maxscale-system-test/testconnections.cpp
@ -643,7 +643,10 @@ void TestConnections::init_maxscale(int m)
 {
    const char * template_name = get_template_name(test_name);

-    stop_maxscale(m);
+    if (maxscale::start)
+    {
+        stop_maxscale(m);
+    }

    process_template(m, template_name, maxscales->access_homedir[m]);
    maxscales->ssh_node_f(m, true,