Code

Merge branch 'collectd-4.5' into collectd-4.6
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 1 May 2009 14:34:51 +0000 (16:34 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 1 May 2009 14:35:34 +0000 (16:35 +0200)
commit52f41fed6e32f66f5817a82ae175fd443084f8a3
treeb80abb35068ea38bf657737f093d12e611eaa817
parent4a453ab95047898e5942e869b09ebcba4c083d28
parent3d4319f8ec237226f85e05848650a0f14f5cf2ab
Merge branch 'collectd-4.5' into collectd-4.6
16 files changed:
src/apcups.c
src/battery.c
src/exec.c
src/hddtemp.c
src/ipmi.c
src/iptables.c
src/irq.c
src/load.c
src/mbmon.c
src/memcached.c
src/nginx.c
src/processes.c
src/sensors.c
src/tcpconns.c
src/users.c
src/vserver.c