![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Sat, 26 Mar 2011 18:01:26 +0000 (11:01 -0700) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Sat, 26 Mar 2011 18:01:26 +0000 (11:01 -0700) | ||
| commit | 7947c0d3d8e4cae18dc55108465eb6fa3b88b5f0 | |
| tree | 83dca54ac64d6e719c95234ab6104fee137821a0 | tree | snapshot |
| parent | 50c6b81549e3239034f71f00ff7dde4c6a8767e5 | commit | diff |
| parent | 7297b3b6ea2149ec4a384b90d14166f228db4de3 | commit | diff |
Merge branch 'collectd-4.10' into collectd-5.0
Conflicts:
ChangeLog
src/libvirt.c
src/plugin.c
src/plugin.h
version-gen.sh
Conflicts:
ChangeLog
src/libvirt.c
src/plugin.c
src/plugin.h
version-gen.sh
| ChangeLog | diff1 | | diff2 | | blob | history |
| src/libvirt.c | diff1 | | diff2 | | blob | history |
| src/plugin.c | diff1 | | diff2 | | blob | history |
| src/plugin.h | diff1 | | diff2 | | blob | history |