counterpoint 8647b30184 Merge remote-tracking branch 'origin/develop' into MXS-105 ...

Conflicts (resolved):
	server/modules/routing/schemarouter/schemarouter.c

2015-05-05 10:54:09 +01:00

..

core

Merge remote-tracking branch 'origin/develop' into MXS-105

2015-05-05 10:54:09 +01:00

include

Added percentage conversion functions to maxconfig.h

2015-04-16 21:51:19 +03:00

inih

Revert "MXS-117: https://mariadb.atlassian.net/browse/MXS-117"

2015-04-24 17:57:41 +03:00

modules

Merge remote-tracking branch 'origin/develop' into MXS-105

2015-05-05 10:54:09 +01:00

test

Notification Service integration added

2015-03-09 18:06:16 +01: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

Binlog Router template

2015-04-08 17:10:47 +02:00

MaxScale_template.cnf

Revert "MXS-117: https://mariadb.atlassian.net/browse/MXS-117"

2015-04-24 17:57:41 +03:00