Markus Makela 15a96f037d Merge remote-tracking branch 'origin/MAX-324' into MAX-324 ...

Conflicts:
	server/modules/routing/dbshard/dbshard.c

2014-12-07 06:11:24 +02:00

..

core

Fix to unreported bug which printed result of getsockopt even in case when there was no socket error.

2014-11-27 15:37:13 +02:00

include

Bug 515 Conditional arguemnt to gw_write

2014-11-19 16:43:21 +00:00

inih

Deal with ._ files

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

modules

Merge remote-tracking branch 'origin/MAX-324' into MAX-324

2014-12-07 06:11:24 +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

Commented out optional Galera monitor option disable_master_failback .

2014-12-03 10:09:29 +02:00