![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Thu, 18 Jun 2015 14:52:09 +0000 (16:52 +0200) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Thu, 18 Jun 2015 14:52:09 +0000 (16:52 +0200) | ||
| commit | 0003c4d3c184f0f437499d6073cd023dc7b659c2 | |
| tree | 0f942489579db24cf4b560df21830491dca1f9ba | tree | snapshot |
| parent | 2493484aac8d45b5a5abdb80f4db8c51db77bf6e | commit | diff |
| parent | 9c3ed6462c15fd1cb664cd0ec2a5efb289aa1af6 | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
| src/Makefile.am | diff1 | | diff2 | | blob | history |
| src/daemon/collectd.c | diff1 | | | | blob | history |
| src/daemon/configfile.c | diff1 | | | | blob | history |
| src/df.c | diff1 | | diff2 | | blob | history |
| src/snmp.c | diff1 | | diff2 | | blob | history |
| src/table.c | diff1 | | diff2 | | blob | history |
| src/threshold.c | diff1 | | diff2 | | blob | history |
| src/utils_db_query.c | diff1 | | diff2 | | blob | history |
| src/virt.c | diff1 | | | | blob | history |