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

..

filter

Fixes to Coverity defects 85010 84878 72752 72742 72719 and 73418.

2015-01-05 06:05:56 +02:00

include

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

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

monitor

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

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

protocol

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

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

routing

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

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

CMakeLists.txt

initial implementation of the CMake build system

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