Markus Makela 3d3b397a67 Merge branch 'develop' of https://github.com/srirampatil/MaxScale into srirampatil-develop ...

Conflicts:
	server/modules/filter/qlafilter.c

2015-06-11 18:41:56 +03:00

..

filter

Merge branch 'develop' of https://github.com/srirampatil/MaxScale into srirampatil-develop

2015-06-11 18:41:56 +03:00

include

Removed plainrouter from MXS-121 branch.

2015-05-18 16:29:14 +03:00

monitor

Added more error logging when monitor scripts fail.

2015-06-10 06:09:42 +03:00

protocol

Merge branch 'install_dir_change' into develop

2015-05-26 13:34:39 +03:00

routing

Merge branch 'install_dir_change' into develop

2015-05-26 13:34:39 +03:00

CMakeLists.txt

initial implementation of the CMake build system

2014-09-11 18:24:41 +03:00