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/testconnections.h
+++ b/maxscale-system-test/testconnections.h
@ -250,6 +250,9 @@ public:
    /** Skip initial start of MaxScale */
    static void skip_maxscale_start(bool value);

+    /** Prepare multiple maxscale instances */
+    static void multiple_maxscales(bool value);
+
    /** Test requires a certain backend version  */
    static void require_repl_version(const char* version);
    static void require_galera_version(const char* version);