diff --git a/Documentation/Release-Notes/MaxScale-2.2.19-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.2.19-Release-Notes.md index 498339da5..8ff6492e8 100644 --- a/Documentation/Release-Notes/MaxScale-2.2.19-Release-Notes.md +++ b/Documentation/Release-Notes/MaxScale-2.2.19-Release-Notes.md @@ -1,4 +1,4 @@ -# MariaDB MaxScale 2.2.19 Release Notes +# MariaDB MaxScale 2.2.19 Release Notes -- 2019-01-11 Release 2.2.19 is a GA release. diff --git a/maxscale-system-test/mysqlmon_failover_rejoin_old_slave.cpp b/maxscale-system-test/mysqlmon_failover_rejoin_old_slave.cpp index c8be47839..fd7993353 100644 --- a/maxscale-system-test/mysqlmon_failover_rejoin_old_slave.cpp +++ b/maxscale-system-test/mysqlmon_failover_rejoin_old_slave.cpp @@ -152,7 +152,7 @@ void run(TestConnections& test) cout << "\nStopping master." << endl; test.repl->stop_node(0); - test.maxscales->wait_for_monitor(); + test.maxscales->wait_for_monitor(2); // server1 (previous master) was taken down, so its state should be /Down/. // server2 should have been made into master, and server4 should still be down. @@ -164,7 +164,7 @@ void run(TestConnections& test) cout << "\nBringing up slave " << N - 1 << endl; test.repl->start_node(N - 1, (char*)""); - test.maxscales->wait_for_monitor(); + test.maxscales->wait_for_monitor(2); // server1 should still be down, server2 still master, and server3 still // a slave. server4 was brought up, so it should have been rejoined and