Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 1 Mar 2016 10:28:16 +0000 (11:28 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 1 Mar 2016 10:28:16 +0000 (11:28 +0100)
commit6a1a62048b6d0d2ddf5c17295609d3ebf010f40b
treeb6d36e2feab587e310e9a8e0a92edf60f5719a31
parent7531a36086295c02ccb2d78c41d355a424426607
parent6a68a39a2c6987fdcc94fb1bdd9cc8f598fd9478
Merge branch 'collectd-5.5'
src/daemon/plugin.h
src/daemon/types_list.c
src/daemon/utils_subst.c
src/liboconfig/oconfig.c
src/processes.c
src/threshold.c
src/utils_cmd_flush.c
src/utils_cmd_getval.c
src/utils_db_query.c