VilhoRaatikka 4a30626974 Merge branch 'Z2' of https://github.com/skysql/MaxScale into Z2 ...

Conflicts:
	client/Makefile
	server/core/buffer.c
	server/core/test/makefile
	server/include/buffer.h
	server/modules/filter/Makefile
	server/modules/routing/webserver.c

2014-08-29 16:21:08 +03:00

..

.gitignore

Updated gitignore files

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

httpd.c

Revert "Implementation of HTTPD protocol, gwbuf properties and a dmeo web application"

2014-07-15 17:53:39 +01:00

Makefile

consistently use DEL instead of rm in Makefiles

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

maxscaled.c

Update plugin status to BETA

2014-07-04 09:23:40 +01:00

mysql_backend.c

Merge from release-1.0beta to Z2

2014-08-15 18:00:39 +03:00

mysql_client.c

Merge from release-1.0beta to Z2

2014-08-15 18:00:39 +03:00

mysql_common.c

Merge from release-1.0beta to Z2

2014-08-15 18:00:39 +03:00

telnetd.c

Update plugin status to BETA

2014-07-04 09:23:40 +01:00