Mark Riddoch d3c8770852 Merge branch 'blr' into develop ...

Conflicts:
	client/maxadmin.c
	server/core/CMakeLists.txt
	server/core/dcb.c
	server/core/gateway.c
	server/core/poll.c
	server/core/test/CMakeLists.txt
	server/core/test/makefile
	server/include/poll.h
	server/modules/routing/debugcmd.c

2014-11-19 12:00:55 +00:00

..

core

Merge branch 'blr' into develop

2014-11-19 12:00:55 +00:00

include

Merge branch 'blr' into develop

2014-11-19 12:00:55 +00:00

inih

Deal with ._ files

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

modules

Merge branch 'blr' into develop

2014-11-19 12:00:55 +00: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