Merge branch '2.1' into 2.2

2018-01-05 09:58:10 +02:00
parent a91b857a43 583c63e7e1
commit bed0b850b1
5 changed files with 20 additions and 8 deletions
--- a/maxscale-system-test/testconnections.cpp
+++ b/maxscale-system-test/testconnections.cpp
@ -316,7 +316,7 @@ TestConnections::~TestConnections()

    copy_all_logs();

-/*  Temporary commnted out due to Galera failure in case of revert
+    /* Temporary disable snapshot revert due to Galera failures
    if (global_result != 0 )
    {
        if (no_vm_revert)
@ -328,7 +328,8 @@ TestConnections::~TestConnections()
            tprintf("Reverting snapshot\n");
            revert_snapshot((char*) "clean");
        }
-    }*/
+    }
+    */

    delete repl;
    if (!no_galera)