Markus Makela 1b0fd4576a Merge branch 'maxinfo' into develop ...

Conflicts:
	server/core/service.c
	server/core/session.c
	server/include/session.h

2015-03-04 11:33:00 +02:00

..

core

Merge branch 'maxinfo' into develop

2015-03-04 11:33:00 +02:00

include

Merge branch 'maxinfo' into develop

2015-03-04 11:33:00 +02:00

inih

remove makefiles and other garbage

2015-01-14 19:08:24 +02:00

modules

Merge branch 'maxinfo' into develop

2015-03-04 11:33:00 +02:00

test

Updates all references to INSTALL_DIR with CMAKE_INSTALL_PREFIX.

2015-01-18 05:55:29 +02:00

CMakeLists.txt

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

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

MaxScale_template.cnf

Fix to bug 736: http://bugs.mariadb.com/show_bug.cgi?id=736

2015-03-01 02:27:47 +02:00