Markus Makela 49d5409dcb Merge branch 'develop' into MXS-121 ...

Conflicts:
	server/modules/monitor/mysql_mon.c

2015-05-09 04:49:06 +03:00

..

CMakeLists.txt

Moved common monitor structures and definitions to a separate header and added master down script to galeramon.

2015-05-07 05:56:13 +03:00

galeramon.c

Merge branch 'develop' into MXS-121

2015-05-09 04:49:06 +03:00

galeramon.h

Moved common monitor functionality to the MONITOR type

2015-05-09 04:47:17 +03:00

mm_mon.c

Merge branch 'develop' into MXS-121

2015-05-09 04:49:06 +03:00

monitor_common.h

Moved common monitor functionality to the MONITOR type

2015-05-09 04:47:17 +03:00

mysql_mon.c

Merge branch 'develop' into MXS-121

2015-05-09 04:49:06 +03:00

mysqlmon.h

Moved common monitor functionality to the MONITOR type

2015-05-09 04:47:17 +03:00

ndbcluster_mon.c

Merge branch 'develop' into MXS-121

2015-05-09 04:49:06 +03:00