From 5f029743030491c1bac9728e1e8f10b368cc6936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Mon, 1 Apr 2019 20:43:49 +0300 Subject: [PATCH 1/2] Fix mxs2057_systemd_watchdog The coredump pattern was wrong. --- maxscale-system-test/mxs2057_systemd_watchdog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maxscale-system-test/mxs2057_systemd_watchdog.cpp b/maxscale-system-test/mxs2057_systemd_watchdog.cpp index bf8852ea9..f41f70e83 100644 --- a/maxscale-system-test/mxs2057_systemd_watchdog.cpp +++ b/maxscale-system-test/mxs2057_systemd_watchdog.cpp @@ -65,7 +65,7 @@ void test_watchdog(TestConnections& test, int argc, char* argv[]) if (test.global_result == 0) { test.tprintf("Maxscale was killed by systemd - ok"); - test.maxscales->ssh_node_f(0, true, "rm -f /tmp/*core"); + test.maxscales->ssh_node_f(0, true, "rm -f /tmp/core*"); } } } From 09c7183a2bc09040d0178f396cef8c2541ba7d87 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Tue, 2 Apr 2019 12:25:11 +0300 Subject: [PATCH 2/2] Update 2.3 maintenance version --- VERSION23.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION23.cmake b/VERSION23.cmake index 6d63f6455..643875ab7 100644 --- a/VERSION23.cmake +++ b/VERSION23.cmake @@ -5,7 +5,7 @@ set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version") set(MAXSCALE_VERSION_MINOR "3" CACHE STRING "Minor version") -set(MAXSCALE_VERSION_PATCH "5" CACHE STRING "Patch version") +set(MAXSCALE_VERSION_PATCH "6" CACHE STRING "Patch version") # This should only be incremented if a package is rebuilt set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")