Merge branch '2.2' into develop

2018-09-12 22:14:56 +03:00
parent 12092d1a90 e1f2b81734
commit 7ec2f77708
21 changed files with 254 additions and 105 deletions
--- a/maxscale-system-test/keepalived.cpp
+++ b/maxscale-system-test/keepalived.cpp
@ -22,6 +22,7 @@ int main(int argc, char* argv[])

    char* version;

+    TestConnections::multiple_maxscales(true);
    TestConnections* Test = new TestConnections(argc, argv);
    Test->set_timeout(10);