![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Fri, 1 May 2009 14:34:51 +0000 (16:34 +0200) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Fri, 1 May 2009 14:35:34 +0000 (16:35 +0200) | ||
| commit | 52f41fed6e32f66f5817a82ae175fd443084f8a3 | |
| tree | b80abb35068ea38bf657737f093d12e611eaa817 | tree | snapshot |
| parent | 4a453ab95047898e5942e869b09ebcba4c083d28 | commit | diff |
| parent | 3d4319f8ec237226f85e05848650a0f14f5cf2ab | commit | diff |
Merge branch 'collectd-4.5' into collectd-4.6
16 files changed:
| src/apcups.c | diff1 | | diff2 | | blob | history |
| src/battery.c | diff1 | | diff2 | | blob | history |
| src/exec.c | diff1 | | diff2 | | blob | history |
| src/hddtemp.c | diff1 | | diff2 | | blob | history |
| src/ipmi.c | diff1 | | diff2 | | blob | history |
| src/iptables.c | diff1 | | diff2 | | blob | history |
| src/irq.c | diff1 | | diff2 | | blob | history |
| src/load.c | diff1 | | diff2 | | blob | history |
| src/mbmon.c | diff1 | | diff2 | | blob | history |
| src/memcached.c | diff1 | | diff2 | | blob | history |
| src/nginx.c | diff1 | | diff2 | | blob | history |
| src/processes.c | diff1 | | diff2 | | blob | history |
| src/sensors.c | diff1 | | diff2 | | blob | history |
| src/tcpconns.c | diff1 | | diff2 | | blob | history |
| src/users.c | diff1 | | diff2 | | blob | history |
| src/vserver.c | diff1 | | diff2 | | blob | history |