Merge branch '2.1' into 2.2

2017-10-30 11:01:19 +02:00
parent d9bd977c35 63cbf56cb2
commit a971aa25da
10 changed files with 91 additions and 107 deletions
--- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1468
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1468
@ -0,0 +1,18 @@
+[maxscale]
+threads=###threads###
+
+[rwsplit-service]
+type=service
+router=readwritesplit
+user=maxskysql
+passwd=skysql
+
+[CLI]
+type=service
+router=cli
+
+[CLI Listener]
+type=listener
+service=CLI
+protocol=maxscaled
+socket=default