Merge branch '2.2' into develop

2018-08-30 11:36:58 +03:00
parent 9c3dc76fa9 4c5e18b4f0
commit a13e95951b
47 changed files with 323 additions and 156 deletions
--- a/maxscale-system-test/avro.cpp
+++ b/maxscale-system-test/avro.cpp
@ -48,8 +48,8 @@ int main(int argc, char *argv[])
    test.set_timeout(120);

    char * output = test.maxscales->ssh_node_output(0,
-                                                    "maxavrocheck -d /var/lib/maxscale/avro/test.t1.000001.avro",
-                                                    true, &exit_code);
+                    "maxavrocheck -d /var/lib/maxscale/avro/test.t1.000001.avro",
+                    true, &exit_code);

    std::istringstream iss;
    iss.str(output);