hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2481 Fix rebase error

Browse Source
This commit is contained in:
Johan Wikman
2019-05-28 12:43:21 +03:00
parent 6e5f7fcfbf
commit 075ed00f58
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
maxscale-system-test/clustrix_nodes.cpp
View File

@ -88,9 +88,9 @@ int Clustrix_nodes::check_replication()
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.
command += ";";
@ -101,9 +101,9 @@ string Clustrix_nodes::block_command(int node) const
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.
command += ";";