11 Commits

Author SHA1 Message Date
counterpoint
8647b30184 Merge remote-tracking branch 'origin/develop' into MXS-105
Conflicts (resolved):
	server/modules/routing/schemarouter/schemarouter.c
2015-05-05 10:54:09 +01:00
Markus Makela
463cd4a97e Moved common sharding functions to a separate file. 2015-05-04 07:06:24 +03:00
counterpoint
03badb9b7b Modifications to galera monitor to control whether selection of master is wanted. 2015-04-24 15:35:10 +01:00
Markus Makela
1b3af7d61f Fixes to Coverity defects. 2015-04-16 19:41:49 +03:00
Markus Makela
be968cfad2 Fixed missing subservices parameter in config. 2015-03-31 12:54:52 +03:00
Markus Makela
e42f171564 Added support for direct connections to shardrouter. 2015-03-30 20:45:05 +03:00
Markus Makela
fbedad84af Fixes to Coverity defects. 2015-03-10 17:08:04 +02:00
Markus Makela
5471d35524 Merge branch 'develop' into MAX-324
Conflicts:
	server/include/modutil.h
2015-03-09 10:18:59 +02:00
Markus Makela
d98dd6e15f Fixing errors caused by the merge with develop. 2015-03-05 11:14:12 +02:00
Markus Makela
561952e1ea Moved service definition to router_options for shardrouter. 2015-02-26 20:34:35 +02:00
Markus Makela
5477cdf5eb Renamed the dbshard module to schemarouter. 2015-02-24 05:49:38 +02:00