Markus Makela fed828eb29 Merge branch 'release-1.0GA' into MAX-324 ...

Conflicts:
	server/MaxScale_template.cnf
	server/core/service.c

2015-01-06 04:45:30 +02:00

..

core

Merge branch 'release-1.0GA' into MAX-324

2015-01-06 04:45:30 +02:00

include

Fix #2 to bug 680: http://bugs.mariadb.com/show_bug.cgi?id=680"

2015-01-05 17:38:45 +02:00

inih

Deal with ._ files

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

modules

Merge branch 'release-1.0GA' into MAX-324

2015-01-06 04:45:30 +02:00

test

Merge branch 'release-1.0GA' into MAX-324

2015-01-06 04:45:30 +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