Merge branch '2.3' into 2.4

maxscale-system-test/maxtest/include/maxtest/clustrix_nodes.h

@@ -23,7 +23,7 @@
 
 #include <errno.h>
 #include <string>
-#include "nodes.h"
+#include "nodes.hh"
 #include "mariadb_nodes.h"
 
 #define CLUSTRIX_DEPS_YUM "yum install -y bzip2 wget screen ntp ntpdate vim htop mdadm"

maxscale-system-test/maxtest/include/maxtest/mariadb_nodes.h

@@ -16,7 +16,7 @@
 #include "mariadb_func.h"
 #include <errno.h>
 #include <string>
-#include "nodes.h"
+#include "nodes.hh"
 
 /**
  * @brief A class to handle backend nodes

maxscale-system-test/maxtest/include/maxtest/maxscales.hh

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <string>
-#include "nodes.h"
+#include "nodes.hh"
 #include "mariadb_func.h"
 #include "mariadb_nodes.h"
 

maxscale-system-test/maxtest/include/maxtest/testconnections.h

@@ -2,7 +2,7 @@
 
 #include "mariadb_nodes.h"
 #include "clustrix_nodes.h"
-#include "maxscales.h"
+#include "maxscales.hh"
 #include "test_dir.hh"
 #include <fcntl.h>
 #include <pthread.h>

maxscale-system-test/maxtest/src/CMakeLists.txt

@@ -1,29 +1,29 @@
 add_library(maxtest SHARED
-        big_load.cpp
+        big_load.cc
-        big_transaction.cpp
+        big_transaction.cc
-        blob_test.cpp
+        blob_test.cc
         clustrix_nodes.cpp
-        config_operations.cpp
+        config_operations.cc
-        different_size.cpp
+        different_size.cc
-        envv.cpp
+        envv.cc
-        execute_cmd.cpp
+        execute_cmd.cc
-        fw_copy_rules.cpp
+        fw_copy_rules.cc
-        get_com_select_insert.cpp
+        get_com_select_insert.cc
-        get_my_ip.cpp
+        get_my_ip.cc
-        keepalived_func.cpp
+        keepalived_func.cc
-        mariadb_func.cpp
+        mariadb_func.cc
-        mariadb_nodes.cpp
+        mariadb_nodes.cc
-        maxadmin_operations.cpp
+        maxadmin_operations.cc
-        maxinfo_func.cpp
+        maxinfo_func.cc
         maxrest.cc
-        maxscales.cpp
+        maxscales.cc
-        nodes.cpp
+        nodes.cc
-        rds_vpc.cpp
+        rds_vpc.cc
-        sql_t1.cpp
+        sql_t1.cc
-        stopwatch.cpp
+        stopwatch.cc
-        tcp_connection.cpp
+        tcp_connection.cc
-        test_binlog_fnc.cpp
+        test_binlog_fnc.cc
-        testconnections.cpp
+        testconnections.cc
         ${CMAKE_CURRENT_BINARY_DIR}/test_info.cc
         # Include the CDC connector in the core library
         ${CMAKE_SOURCE_DIR}/connectors/cdc-connector/cdc_connector.cpp)

maxscale-system-test/maxtest/src/envv.cc

@@ -1,4 +1,4 @@
-#include "envv.h"
+#include "envv.hh"
 
 #include <cstring>
 #include <cstdarg>

maxscale-system-test/maxtest/src/execute_cmd.cc

@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include "execute_cmd.h"
+#include "execute_cmd.hh"
 
 using namespace std;
 

maxscale-system-test/maxtest/src/mariadb_nodes.cc

@@ -20,7 +20,7 @@
 #include <future>
 #include <functional>
 #include <algorithm>
-#include "envv.h"
+#include "envv.hh"
 
 using std::cout;
 using std::endl;

maxscale-system-test/maxtest/src/maxscales.cc

@@ -1,8 +1,8 @@
-#include "maxscales.h"
+#include "maxscales.hh"
 #include <sstream>
 #include <unordered_map>
 #include <string>
-#include "envv.h"
+#include "envv.hh"
 
 Maxscales::Maxscales(const char *pref,
                      const char *test_cwd,

maxscale-system-test/maxtest/src/nodes.cc

@@ -1,4 +1,4 @@
-#include "nodes.h"
+#include "nodes.hh"
 #include <string>
 #include <cstring>
 #include <iostream>
@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <signal.h>
 
-#include "envv.h"
+#include "envv.hh"
 
 Nodes::Nodes(const char* pref,
              const std::string& network_config,

maxscale-system-test/maxtest/src/rds_vpc.cc

@@ -1,4 +1,4 @@
-#include "execute_cmd.h"
+#include "execute_cmd.hh"
 #include "rds_vpc.h"
 
 RDS::RDS(char* cluster)

maxscale-system-test/maxtest/src/stopwatch.cc

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "stopwatch.h"
+#include "stopwatch.hh"
 
 #include <iomanip>
 #include <iostream>

maxscale-system-test/maxtest/src/tcp_connection.cc

@@ -1,4 +1,4 @@
-#include "tcp_connection.h"
+#include "tcp_connection.hh"
 
 #include <sys/types.h>
 #include <sys/socket.h>

maxscale-system-test/maxtest/src/testconnections.cc

@@ -22,7 +22,7 @@
 #include "sql_t1.h"
 #include "testconnections.h"
 #include "test_info.hh"
-#include "envv.h"
+#include "envv.hh"
 
 using namespace mxb;
 using std::cout;

maxscale-system-test/mxs1628_bad_handshake.cpp

@@ -1,5 +1,5 @@
 #include "testconnections.h"
-#include "tcp_connection.h"
+#include "tcp_connection.hh"
 
 #include <vector>
 

maxscale-system-test/mxs173_throttle_filter.cpp

@@ -4,8 +4,8 @@
  */
 
 #include "testconnections.h"
-#include "stopwatch.h"
+#include "stopwatch.hh"
-#include "appexception.h"
+#include "appexception.hh"
 #include <iostream>
 #include <memory>
 #include <sstream>