Merge branch 'collectd-5.4'
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 7 Jan 2015 23:18:57 +0000 (00:18 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 7 Jan 2015 23:18:57 +0000 (00:18 +0100)
commitca316d91e178412604ea8462dc60a8bc32cbfc87
tree40355789d8cbad4ae77ef20689634db6eb8c1bdb
parent681a607a4b1a95df1d53d3e6922ec70bd52f87cf
parentecbcaadde7dff838f09dfb04c7eb90f126e35abf
Merge branch 'collectd-5.4'
13 files changed:
configure.ac
contrib/redhat/collectd.spec
src/collectd.conf.in
src/cpu.c
src/daemon/types_list.c
src/libcollectdclient/client.c
src/netlink.c
src/utils_cmd_flush.c
src/utils_cmd_getval.c
src/utils_cmd_listval.c
src/utils_cmd_putnotif.c
src/utils_cmd_putval.c
src/virt.c