Markus Makela a5ece62327 Merge branch 'develop' into firewall ...

Conflicts:
	server/modules/filter/test/harness.h
	server/modules/filter/test/harness_common.c

2014-11-17 18:45:01 +02:00

..

core

Added debug logging for #615

2014-11-14 20:48:33 +02:00

include

Addition of timeout for connect,read,write

2014-11-10 15:13:26 +01:00

inih

initial implementation of the CMake build system

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

modules

Merge branch 'develop' into firewall

2014-11-17 18:45:01 +02:00

test

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

2014-10-14 19:15:59 +03: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

Add the CLI to the template configuration file

2014-11-14 10:36:32 +00:00