Code

Merge branch 'collectd-4.0' into collectd-4.1
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 12 Oct 2007 16:33:59 +0000 (18:33 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 12 Oct 2007 16:33:59 +0000 (18:33 +0200)
commit09c6d16ffba1b1b15e50579bbcf663f05f630932
tree4632ec84b6d12fd80acfe77623441231c70b93fa
parent5e73df5f8ec52055e5f79be5d898e5baec4c9967
parent8a384e732834fb5d42d9ff4ebec40482fb07372e
Merge branch 'collectd-4.0' into collectd-4.1

Conflicts:

src/rrdtool.c
src/collectd.conf.pod
src/network.c
src/processes.c
src/rrdtool.c
src/unixsock.c