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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Markus Mäkelä
2019-12-05 10:21:41 +02:00
parent 56a24612dd fa656c6870
commit 5d1c7e88c7
2 changed files with 4 additions and 2 deletions
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_MAJOR "2" CACHE STRING "Major version")
set(MAXSCALE_VERSION_MINOR "3" CACHE STRING "Minor version") set(MAXSCALE_VERSION_MINOR "3" CACHE STRING "Minor version")
set(MAXSCALE_VERSION_PATCH "15" CACHE STRING "Patch version") set(MAXSCALE_VERSION_PATCH "16" CACHE STRING "Patch version")
# This should only be incremented if a package is rebuilt # This should only be incremented if a package is rebuilt
set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number") set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")

4
maxscale-system-test/cnf/maxscale.cnf.template.kerberos_ssl
View File

@ -79,7 +79,7 @@ ssl=required
ssl_cert=/###access_homedir###/certs/server-cert.pem ssl_cert=/###access_homedir###/certs/server-cert.pem
ssl_key=/###access_homedir###/certs/server-key.pem ssl_key=/###access_homedir###/certs/server-key.pem
ssl_ca_cert=/###access_homedir###/certs/ca.pem ssl_ca_cert=/###access_homedir###/certs/ca.pem
ssl_verify_peer_cert=false
[Read-Connection-Listener-Slave] [Read-Connection-Listener-Slave]
type=listener type=listener
@ -92,6 +92,7 @@ ssl=required
ssl_cert=/###access_homedir###/certs/server-cert.pem ssl_cert=/###access_homedir###/certs/server-cert.pem
ssl_key=/###access_homedir###/certs/server-key.pem ssl_key=/###access_homedir###/certs/server-key.pem
ssl_ca_cert=/###access_homedir###/certs/ca.pem ssl_ca_cert=/###access_homedir###/certs/ca.pem
ssl_verify_peer_cert=false
[Read-Connection-Listener-Master] [Read-Connection-Listener-Master]
type=listener type=listener
@ -104,6 +105,7 @@ ssl=required
ssl_cert=/###access_homedir###/certs/server-cert.pem ssl_cert=/###access_homedir###/certs/server-cert.pem
ssl_key=/###access_homedir###/certs/server-key.pem ssl_key=/###access_homedir###/certs/server-key.pem
ssl_ca_cert=/###access_homedir###/certs/ca.pem ssl_ca_cert=/###access_homedir###/certs/ca.pem
ssl_verify_peer_cert=false
[CLI-Listener] [CLI-Listener]
type=listener type=listener