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

..

core

Fixed a segfault and disabled syslog by default.

2015-06-11 18:25:42 +03:00

include

Fixed some hard-coded paths being used instead of CMake variable values.

2015-06-11 10:28:35 +03:00

inih

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

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

modules

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

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

test

Removed old unused cmake variables, updated documentation and fixed testall suite.

2015-05-26 15:12:29 +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

Merge branch 'install_dir_change' into develop

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