From d5016063996a9351d5d261c70cf1a42ba82035f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Fri, 27 Jul 2018 20:03:48 +0300 Subject: [PATCH 1/3] Add clarification to mailing list email The email should be sent after the binaries are visible and the KB has been updated. --- maxscale-system-test/Documentation/RELEASE.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/maxscale-system-test/Documentation/RELEASE.md b/maxscale-system-test/Documentation/RELEASE.md index cbadd7125..0412a90f3 100644 --- a/maxscale-system-test/Documentation/RELEASE.md +++ b/maxscale-system-test/Documentation/RELEASE.md @@ -229,8 +229,9 @@ Br, ## 9. Send release email to mailing list -Email maxscale@googlegroups.com with a mail containing the following. Replace -`x.y.z` with the correct version. +After the KB has been updated and the binaries are visible on the downloads +page, email maxscale@googlegroups.com with a mail containing the +following. Replace `x.y.z` with the correct version. Subject: `MariaDB MaxScale x.y.z available for download` From a91b054eb4ae81a4c971259be8b6a9d0da25a85e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Sat, 28 Jul 2018 22:33:54 +0300 Subject: [PATCH 2/3] Fix out-of-source runs of mxs791_galera.sh The test used the current directory instead of the source directory where the script was located. --- maxscale-system-test/mxs791_galera.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/maxscale-system-test/mxs791_galera.sh b/maxscale-system-test/mxs791_galera.sh index 421549f84..13955bfe3 100755 --- a/maxscale-system-test/mxs791_galera.sh +++ b/maxscale-system-test/mxs791_galera.sh @@ -4,14 +4,14 @@ ## @file mxs791.sh Simple connect test in bash ## - connects to Maxscale, checks that defined in cmd line DB is selected -rp=`realpath $0` +srcdir=$(dirname $(realpath $0)) export test_dir=`pwd` export test_name="mxs791_galera.sh" echo test name is $test_name -$test_dir/mxs791_base.sh +$srcdir/mxs791_base.sh res=$? -$test_dir/copy_logs.sh $test_name +$srcdir/copy_logs.sh $test_name exit $res From a6afc7fcbde8f218edf039addc4e6798ec6cda76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Tue, 31 Jul 2018 09:25:57 +0300 Subject: [PATCH 3/3] Update 2.2 version number Updated version to 2.2.13 in preparation for the next release. --- VERSION22.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION22.cmake b/VERSION22.cmake index 125739db2..d8d3ddcac 100644 --- a/VERSION22.cmake +++ b/VERSION22.cmake @@ -5,7 +5,7 @@ set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version") set(MAXSCALE_VERSION_MINOR "2" CACHE STRING "Minor version") -set(MAXSCALE_VERSION_PATCH "12" CACHE STRING "Patch version") +set(MAXSCALE_VERSION_PATCH "13" CACHE STRING "Patch version") # This should only be incremented if a package is rebuilt set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")