Merge branch 'release-1.0GA' into MAX-324

Browse Source

Conflicts:
	server/MaxScale_template.cnf
	server/core/service.c

...

This commit is contained in:

Markus Makela

2015-01-06 04:45:30 +02:00

parent ce53159e7d f3c62f4846

commit fed828eb29

96 changed files with 2931 additions and 1001 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

803

server/modules/routing/readwritesplit/readwritesplit.c

File diff suppressed because it is too large Load Diff