counterpoint dee20fe077 Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111 ...

# Conflicts:
#	server/core/CMakeLists.txt
#	server/core/buffer.c
#	server/core/service.c
#	server/modules/filter/tee.c
#	server/modules/monitor/mysql_mon.c
#	server/modules/routing/binlog/blr.c
#	server/modules/routing/binlog/blr_slave.c
#	server/modules/routing/debugcmd.c
#	server/modules/routing/readwritesplit/readwritesplit.c
#	utils/skygw_utils.cc

- resolved.

2015-11-11 11:08:02 +00:00

..

core

Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111

2015-11-11 11:08:02 +00:00

include

Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111

2015-11-11 11:08:02 +00:00

inih

Added support for multiline options for routers and filters.

2015-09-01 14:06:14 +03:00

modules

Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111

2015-11-11 11:08:02 +00:00

test

The datadir path is now used as the location where the process specific data directories are created.

2015-09-03 19:30:16 +03:00

CMakeLists.txt

Fixed CMake builds overwriting MaxScale.cnf when installing after tests were built.

2014-10-14 19:15:59 +03:00

maxscale_binlogserver_template.cnf

Changed relevant files to use get_cachedir() instead of using the now deprecated MAXSCALE_HOME.

2015-04-27 21:55:57 +03:00

maxscale_template.cnf

Fix to MXS-436: https://mariadb.atlassian.net/browse/MXS-436

2015-11-02 12:00:08 +02:00