Merge branch '2.1' into develop

maxscale-system-test/cnf/maxscale.cnf.template.galera

@@ -1,6 +1,5 @@
 [maxscale]
 threads=###threads###
-log_warning=1
 
 [Galera Monitor]
 type=monitor
@@ -17,11 +16,13 @@ router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
+router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
+max_slave_connections=1
 
 [Read Connection Router Slave]
 type=service
 router=readconnroute
-router_options= slave
+router_options=slave
 servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
@@ -39,7 +40,6 @@ type=listener
 service=RW Split Router
 protocol=MySQLClient
 port=4006
-#socket=/tmp/rwsplit.sock
 
 [Read Connection Listener Slave]
 type=listener
@@ -53,6 +53,16 @@ service=Read Connection Router Master
 protocol=MySQLClient
 port=4008
 
+[CLI]
+type=service
+router=cli
+
+[CLI Listener]
+type=listener
+service=CLI
+protocol=maxscaled
+socket=default
+
 [server1]
 type=server
 address=###galera_server_IP_1###
@@ -76,14 +86,3 @@ type=server
 address=###galera_server_IP_4###
 port=###galera_server_port_4###
 protocol=MySQLBackend
-
-[CLI]
-type=service
-router=cli
-
-[CLI Listener]
-type=listener
-service=CLI
-protocol=maxscaled
-#address=localhost
-socket=default

maxscale-system-test/cnf/maxscale.cnf.template.galera.weight

@@ -44,6 +44,16 @@ protocol=MySQLClient
 port=4008
 #socket=/tmp/readconn.sock
 
+[CLI]
+type=service
+router=cli
+
+[CLI Listener]
+type=listener
+service=CLI
+protocol=maxscaled
+socket=default
+
 [server1]
 type=server
 address=###galera_server_IP_1###

maxscale-system-test/cnf/maxscale.cnf.template.regexfilter1

@@ -101,3 +101,13 @@ type=server
 address=###node_server_IP_4###
 port=###node_server_port_4###
 protocol=MySQLBackend
+
+[CLI]
+type=service
+router=cli
+
+[CLI Listener]
+type=listener
+service=CLI
+protocol=maxscaled
+socket=default

maxscale-system-test/cnf/maxscale.cnf.template.replication

@@ -87,4 +87,3 @@ type=server
 address=###node_server_IP_4###
 port=###node_server_port_4###
 protocol=MySQLBackend
-

maxscale-system-test/cnf/maxscale.cnf.template.replication.one_slave

@@ -17,6 +17,7 @@ max_slave_connections=1
 servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
+router_options=disable_sescmd_history=false
 
 [Read Connection Router Slave]
 type=service
@@ -53,6 +54,16 @@ service=Read Connection Router Master
 protocol=MySQLClient
 port=4008
 
+[CLI]
+type=service
+router=cli
+
+[CLI Listener]
+type=listener
+service=CLI
+protocol=maxscaled
+socket=default
+
 [server1]
 type=server
 address=###node_server_IP_1###