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

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Johan Wikman 2019-04-02 12:29:11 +03:00
commit 370c57ebbc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION23.cmake
View File

@ -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")

2
maxscale-system-test/mxs2057_systemd_watchdog.cpp
View File

@ -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*");
}
}
}