![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Fri, 7 Sep 2012 09:15:24 +0000 (11:15 +0200) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Fri, 7 Sep 2012 09:15:24 +0000 (11:15 +0200) | ||
| commit | fda68e239798cea197a225ed5325f5bb3c2e70de | |
| tree | f462028b0cfb6c0a33da163d07786aec3f19cba2 | tree | snapshot |
| parent | 180f2ba844e00bd0e73acc5b4445b48652e47dcd | commit | diff |
| parent | b4c8f3f762d666742c774ab3b45815e5a416e5da | commit | diff |
Merge branch 'collectd-5.0' into collectd-5.1
Conflicts:
src/swap.c
Conflicts:
src/swap.c
| configure.in | diff1 | | diff2 | | blob | history |
| contrib/collection3/bin/index.cgi | diff1 | | diff2 | | blob | history |
| src/Makefile.am | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/snmp.c | diff1 | | diff2 | | blob | history |
| src/utils_avltree.c | diff1 | | diff2 | | blob | history |