Mark Riddoch 764ceac105 Merge branch 'httpd' into MAX-157 ...

Conflicts:
	server/core/buffer.c
	server/include/buffer.h

2014-07-16 18:31:12 +01:00

..

core

Merge branch 'httpd' into MAX-157

2014-07-16 18:31:12 +01:00

include

Merge branch 'httpd' into MAX-157

2014-07-16 18:31:12 +01:00

inih

Updated gitignore files

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

modules

Added some documentation

2014-07-16 16:11:27 +01:00

test

Changed how MaxScale unit test works.

2014-04-10 19:08:28 +03:00

Makefile

Updated Makefile to resolve issue with adding extra MaxScale in the

2014-07-01 16:53:10 +01:00

MaxScale_template.cnf

Added description, syntax and example for max_slave_connections, max_slave_replicatoin_lag and router_options=slave_selection_criteria

2014-07-02 13:00:17 +03:00