Merge branch '2.1' into develop

2017-09-20 10:47:53 +03:00
parent 3936c71e11 8ff0c0ad6d
commit 68bcd00a22
16 changed files with 278 additions and 60 deletions
--- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1323
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1323
@ -1,6 +1,8 @@
 [maxscale]
 threads=###threads###
 log_info=1
+auth_read_timeout=1
+auth_connect_timeout=1

 [MySQL Monitor]
 type=monitor
@ -9,7 +11,9 @@ module=mysqlmon
 servers= server1,server2
 user=maxskysql
 passwd= skysql
-monitor_interval=500
+monitor_interval=1000
+backend_read_timeout=1
+backend_connect_timeout=1

 [RW Split Router]
 type=service