Code

Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 1 Mar 2016 10:26:25 +0000 (11:26 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 1 Mar 2016 10:26:25 +0000 (11:26 +0100)
commit6a68a39a2c6987fdcc94fb1bdd9cc8f598fd9478
tree6c55fe32d2f94fc48a1b5282c193daee25bdd4ac
parent6d13532642c934667697842e4ff021e070ddf34d
parent8d913d388c069a43ca92683b60c86607630ee9bd
Merge branch 'collectd-5.4' into collectd-5.5
16 files changed:
src/daemon/plugin.h
src/daemon/types_list.c
src/daemon/utils_random.c
src/daemon/utils_subst.c
src/liboconfig/oconfig.c
src/processes.c
src/sensors.c
src/threshold.c
src/utils_cmd_flush.c
src/utils_cmd_getval.c
src/utils_cmd_putnotif.c
src/utils_cmd_putval.c
src/utils_db_query.c
src/utils_latency.c
src/utils_latency.h
src/xmms.c