Merge branch 'master' into refactor/check_tcp

3 files changed, 3 insertions, 16 deletions

diff --git a/.github/NPTest.cache b/.github/NPTest.cache
index d488d1b9..6b463e74 100644
--- a/.github/NPTest.cache
+++ b/.github/NPTest.cache
@@ -38,8 +38,8 @@
   'NP_MYSQL_LOGIN_DETAILS' => '-u root -d test',
   'NP_MYSQL_SERVER' => 'localhost',
   'NP_MYSQL_SOCKET' => '/var/run/mysqld/mysqld.sock',
-  'NP_MYSQL_WITH_SLAVE' => '',
-  'NP_MYSQL_WITH_SLAVE_LOGIN' => '',
+  'NP_MYSQL_WITH_REPLICA' => '',
+  'NP_MYSQL_WITH_REPLICA_LOGIN' => '',
   'NP_NO_NTP_SERVICE' => 'localhost',
   'NP_PORT_TCP_PROXY' => '3128',
   'NP_SMB_SHARE' => '',
diff --git a/.github/monitoring-plugins.spec b/.github/monitoring-plugins.spec
index 5cae3e59..64ee34f2 100644
--- a/.github/monitoring-plugins.spec
+++ b/.github/monitoring-plugins.spec
@@ -193,7 +193,6 @@ Requires: %{name}-ntp_peer
 Requires: %{name}-ntp_time
 Requires: %{name}-nwstat
 Requires: %{name}-oracle
-Requires: %{name}-overcr
 Requires: %{name}-pgsql
 Requires: %{name}-ping
 Requires: %{name}-procs
@@ -729,19 +728,6 @@ Provides check_oracle of the Monitoring Plugins.
 
 
 
-# check_overcr
-%package overcr
-Summary:  Monitoring Plugins - check_overcr
-Requires: %{name} = %{version}-%{release}
-
-%description overcr
-Provides check_overcr of the Monitoring Plugins.
-
-%files overcr
-%{plugindir}/check_overcr
-
-
-
 # check_pgsql
 %package pgsql
 Summary:  Monitoring Plugins - check_pgsql
diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh
index c79211cd..f7b6cf9f 100755
--- a/.github/prepare_debian.sh
+++ b/.github/prepare_debian.sh
@@ -59,6 +59,7 @@ apt-get -y install perl \
         mariadb-server \
         mariadb-client \
         libmariadb-dev \
+        libmariadb-dev-compat \
         cron \
         iputils-ping \
         iproute2 \