[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 src/netlink.c |    6 ------
 src/plugin.c  |    1 -
 2 files changed, 7 deletions(-)

New commits:
commit 6d43c759c9495118ef3c088fd2d06fd09c4fda8f
Merge: bfe12932b1d1b9d05b210d1462228d34d37cbdc2 39ab70bc40bb5e68c970b694c52c832ddfd5303a
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Sep 1 21:00:46 2007 +0200

    Merge branch 'collectd-4.0'

commit bfe12932b1d1b9d05b210d1462228d34d37cbdc2
Merge: 35eb5185beb91eee44d41ed9149cee1fe5405002 a392d55f295710f97ce970d3931ffe545c41511f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Sep 1 21:00:40 2007 +0200

    Merge branch 'pull/master'

commit 39ab70bc40bb5e68c970b694c52c832ddfd5303a
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Sep 1 20:54:35 2007 +0200

    src/plugin.c: Remove a legacy debug message.

commit 35eb5185beb91eee44d41ed9149cee1fe5405002
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Sep 1 20:53:52 2007 +0200

    netlink plugin: Removed unused code.