VilhoRaatikka 0b89245a4b Merge branch 'develop' into MAX-167 ...

Conflicts:
	server/modules/monitor/mysql_mon.c
	server/modules/routing/readwritesplit/readwritesplit.c

2014-06-30 14:17:00 +03:00

..

core

Merge branch 'develop' into MAX-167

2014-06-30 14:17:00 +03:00

include

Merge branch 'develop' into MAX-167

2014-06-30 14:17:00 +03:00

inih

Updated gitignore files

2014-02-05 14:49:05 +01:00

modules

Merge branch 'develop' into MAX-167

2014-06-30 14:17:00 +03:00

test

Merge branch 'master' into blr

2014-05-19 13:46:47 +01:00

Makefile

First working filters implementaton.

2014-05-30 16:45:39 +01:00

MaxScale_template.cnf

Listed and described shortly max_slave_connections and server_options=slave_selection_criteria parameters.

2014-06-27 10:50:56 +03:00