Mark Riddoch a655e394ac Merge branch 'blr' into release-1.0GA ...

Conflicts:
	server/core/service.c

2014-12-16 15:44:19 +00:00

..

core

Merge branch 'blr' into release-1.0GA

2014-12-16 15:44:19 +00:00

include

Merge branch 'blr' into release-1.0GA

2014-12-16 15:44:19 +00:00

inih

Deal with ._ files

2014-10-17 08:40:06 +01:00

modules

Merge branch 'blr' into release-1.0GA

2014-12-16 15:44:19 +00:00

test

Updated MaxScale_test.cnf

2014-12-12 17:15:11 +02:00

CMakeLists.txt

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

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

Makefile

Updated non-source files with new company name.

2014-10-01 15:21:47 +03:00

MaxScale_template.cnf

Fix to bug #641, http://bugs.mariadb.com/show_bug.cgi?id=641

2014-12-09 11:03:02 +02:00