]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
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)
16 files changed:
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/processes.c
Simple merge
diff --cc src/sensors.c
Simple merge
diff --cc src/threshold.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/xmms.c
Simple merge