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)
16 files changed:
1  2 
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

diff --cc src/apcups.c
Simple merge
diff --cc src/battery.c
Simple merge
diff --cc src/exec.c
Simple merge
diff --cc src/hddtemp.c
Simple merge
diff --cc src/ipmi.c
Simple merge
diff --cc src/iptables.c
Simple merge
diff --cc src/irq.c
Simple merge
diff --cc src/load.c
Simple merge
diff --cc src/mbmon.c
Simple merge
diff --cc src/memcached.c
Simple merge
diff --cc src/nginx.c
Simple merge
diff --cc src/processes.c
Simple merge
diff --cc src/sensors.c
Simple merge
diff --cc src/tcpconns.c
Simple merge
diff --cc src/users.c
Simple merge
diff --cc src/vserver.c
Simple merge