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

[Florian Forster]

 src/Makefile.am         |    6 +++---
 src/collectd-python.pod |    1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 068146351a826b413ea6dedf1c834e31e0ad11f6
Merge: 921d4724aaf1e59b9bf5b1839bd12a18d88d198b 7970f59dff204401069cfc53f7c53f207a681428
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon May 3 09:48:34 2010 +0200

    Merge branch 'collectd-4.10'

commit 7970f59dff204401069cfc53f7c53f207a681428
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon May 3 09:47:42 2010 +0200

    src/Makefile.am: Fix building / packaging without the Pinba plugin.
    
    Getting the dependency right on generated sources wasn't quite as easy as I
    hoped.

commit 02428b77975c086b108fae378ad5f139a606be7b
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon May 3 09:34:27 2010 +0200

    collectd-python(5): Fix POD syntax error.