Merge branch '2.2' into develop

2018-03-27 14:05:47 +03:00
parent 279fbf0fbe 7df28f330b
commit ed6b19f7f7
3 changed files with 20 additions and 0 deletions
--- a/maxscale-system-test/testconnections.cpp
+++ b/maxscale-system-test/testconnections.cpp
@ -623,6 +623,8 @@ int TestConnections::init_maxscale(int m)
 {
    const char * template_name = get_template_name(test_name);

+    stop_maxscale(m);
+
    process_template(m, template_name, maxscales->access_homedir[m]);
    maxscales->ssh_node_f(m, true,
                          "cp maxscale.cnf %s;rm -rf %s/certs;mkdir -m a+wrx %s/certs;",