![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Wed, 7 Jan 2015 23:18:57 +0000 (00:18 +0100) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Wed, 7 Jan 2015 23:18:57 +0000 (00:18 +0100) | ||
| commit | ca316d91e178412604ea8462dc60a8bc32cbfc87 | |
| tree | 40355789d8cbad4ae77ef20689634db6eb8c1bdb | tree | snapshot |
| parent | 681a607a4b1a95df1d53d3e6922ec70bd52f87cf | commit | diff |
| parent | ecbcaadde7dff838f09dfb04c7eb90f126e35abf | commit | diff |
Merge branch 'collectd-5.4'
13 files changed:
| configure.ac | diff1 | | diff2 | | blob | history |
| contrib/redhat/collectd.spec | diff1 | | diff2 | | blob | history |
| src/collectd.conf.in | diff1 | | diff2 | | blob | history |
| src/cpu.c | diff1 | | diff2 | | blob | history |
| src/daemon/types_list.c | diff1 | | | | blob | history |
| src/libcollectdclient/client.c | diff1 | | diff2 | | blob | history |
| src/netlink.c | diff1 | | diff2 | | blob | history |
| src/utils_cmd_flush.c | diff1 | | diff2 | | blob | history |
| src/utils_cmd_getval.c | diff1 | | diff2 | | blob | history |
| src/utils_cmd_listval.c | diff1 | | diff2 | | blob | history |
| src/utils_cmd_putnotif.c | diff1 | | diff2 | | blob | history |
| src/utils_cmd_putval.c | diff1 | | diff2 | | blob | history |
| src/virt.c | diff1 | | | | blob | history |