Mark Riddoch 63252e94f2 Merge branch 'release-1.0beta-refresh' into blr ...

Fix conflict and remove some redundant code

Conflicts:
	server/core/poll.c

2014-09-24 16:49:12 +01:00

..

core

Merge branch 'release-1.0beta-refresh' into blr

2014-09-24 16:49:12 +01:00

include

Merge branch 'release-1.0beta-refresh' into blr

2014-09-24 16:49:12 +01:00

inih

initial implementation of the CMake build system

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

modules

Merge branch 'release-1.0beta-refresh' into blr

2014-09-24 16:49:12 +01:00

test

Merging 'cmake_build' into 'release-1.0beta-refresh'

2014-09-24 17:29:23 +03:00

CMakeLists.txt

Added more build options and README changes

2014-09-15 11:48:40 +03:00

Makefile

consistently use DEL instead of rm in Makefiles

2014-08-17 21:02:24 +00:00

MaxScale_template.cnf

Replaced RWSplit parameters write_ses_variables_to_all and read_ses_variables_from_slaves with

2014-09-10 11:32:53 +03:00