Markus Makela 7ea53f0141 Merge remote-tracking branch 'origin/MAX-160' into MAX-237 ...

Conflicts:
	query_classifier/query_classifier.cc
	query_classifier/query_classifier.h

2014-08-29 11:02:03 +03:00

..

core

Merge remote-tracking branch 'origin/MAX-160' into MAX-237

2014-08-29 11:02:03 +03:00

include

Merge remote-tracking branch 'origin/MAX-160' into MAX-237

2014-08-29 11:02:03 +03:00

inih

Updated gitignore files

2014-02-05 14:49:05 +01:00

modules

Merge remote-tracking branch 'origin/MAX-160' into MAX-237

2014-08-29 11:02:03 +03:00

test

Bug 462, http://bugs.skysql.com/show_bug.cgi?id=462, fixed path MAXSCALE_HOME path expression in server/test/makefile

2014-07-29 22:28:44 +03:00

Makefile

consistently use DEL instead of rm in Makefiles

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

MaxScale_template.cnf

30s is now the default value for replication lag

2014-08-04 17:10:25 +02:00