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

..

test

Additional tests for maxadmin and diagnostics within maxscale

2014-10-08 11:26:36 +01:00

.gitignore

gitignore cleanup

2014-08-18 09:39:29 +00:00

CMakeLists.txt

Changed variable names to closer match their usage

2014-09-15 14:12:55 +03:00

Makefile

Updated non-source files with new company name.

2014-10-01 15:21:47 +03:00

maxadmin.c

Merge branch 'blr' into develop

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