MXS-2481 Fix rebase error

This commit is contained in:
Johan Wikman
2019-05-28 12:43:21 +03:00
parent 6e5f7fcfbf
commit 075ed00f58

View File

@ -88,9 +88,9 @@ int Clustrix_nodes::check_replication()
return res; return res;
} }
string Clustrix_nodes::block_command(int node) const std::string Clustrix_nodes::block_command(int node) const
{ {
string command = Mariadb_nodes::block_command(node); std::string command = Mariadb_nodes::block_command(node);
// Block health-check port as well. // Block health-check port as well.
command += ";"; command += ";";
@ -101,9 +101,9 @@ string Clustrix_nodes::block_command(int node) const
return command; return command;
} }
string Clustrix_nodes::unblock_command(int node) const std::string Clustrix_nodes::unblock_command(int node) const
{ {
string command = Mariadb_nodes::unblock_command(node); std::string command = Mariadb_nodes::unblock_command(node);
// Unblock health-check port as well. // Unblock health-check port as well.
command += ";"; command += ";";