Merge branch '2.2' into 2.3

2019-04-24 12:51:32 +03:00
parent f8c964163f 64a8288f66
commit b972d88bba
2 changed files with 6 additions and 6 deletions
--- a/maxscale-system-test/maxscales.h
+++ b/maxscale-system-test/maxscales.h
@ -21,7 +21,7 @@ public:
    };

    Maxscales(const char *pref, const char *test_cwd, bool verbose, bool use_valgrind,
-              std::__cxx11::string network_config);
+              std::string network_config);

    int read_env();