counterpoint dee20fe077 Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111 ...

# Conflicts:
#	server/core/CMakeLists.txt
#	server/core/buffer.c
#	server/core/service.c
#	server/modules/filter/tee.c
#	server/modules/monitor/mysql_mon.c
#	server/modules/routing/binlog/blr.c
#	server/modules/routing/binlog/blr_slave.c
#	server/modules/routing/debugcmd.c
#	server/modules/routing/readwritesplit/readwritesplit.c
#	utils/skygw_utils.cc

- resolved.

2015-11-11 11:08:02 +00:00

..

CMakeLists.txt

Removed redundant linking of the utils library.

2015-08-10 10:40:00 +03:00

galeramon.c

Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111

2015-11-11 11:08:02 +00:00

galeramon.h

Added galeramon server priorities.

2015-07-13 14:39:04 +03:00

mmmon.c

Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111

2015-11-11 11:08:02 +00:00

mmmon.h

Renamed mon_exec files to externcmd.

2015-05-18 18:34:43 +03:00

monitor_common.c

Added detection of connection timeout when monitors connect to backend servers.

2015-10-26 17:30:34 +02:00

monitor_common.h

Added detection of connection timeout when monitors connect to backend servers.

2015-10-26 17:30:34 +02:00

mysql_mon.c

Merge remote-tracking branch 'origin/develop' into MXS-329-develop-20151111

2015-11-11 11:08:02 +00:00

mysqlmon.h

Added code for MySQL 5.1 replication detection.

2015-06-30 21:37:29 +03:00

ndbclustermon.c

Log variables moved to log_manager.h

2015-11-04 14:26:53 +02:00

ndbclustermon.h

Renamed mon_exec files to externcmd.

2015-05-18 18:34:43 +03:00