![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@huhu.verplant.org> | |
| Thu, 25 Feb 2010 22:55:25 +0000 (23:55 +0100) | ||
| committer | Florian Forster <octo@huhu.verplant.org> | |
| Thu, 25 Feb 2010 22:55:25 +0000 (23:55 +0100) | ||
| commit | 3bd6fcdfd20002eee1f1803460728449c0c98f86 | |
| tree | 84408aeba132da90a60061f6c81fcb935d369b3a | tree | snapshot |
| parent | c253952ba26a4123aade567d590ff206f84ec82f | commit | diff |
| parent | d3dbc7f5429ff928ed616beb8574f081235ef85b | commit | diff |
Merge branch 'collectd-4.8' into collectd-4.9
Conflicts:
src/ping.c
Conflicts:
src/ping.c
| configure.in | diff1 | | diff2 | | blob | history |
| src/apache.c | diff1 | | diff2 | | blob | history |
| src/collectd.conf.in | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/exec.c | diff1 | | diff2 | | blob | history |
| src/ping.c | diff1 | | diff2 | | blob | history |
| src/plugin.c | diff1 | | diff2 | | blob | history |