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

[Florian Forster]

 ChangeLog                 |   23 ++++++++++-
 README                    |   35 +++++++++++++++--
 bindings/Makefile.am      |    6 +++
 bindings/java/Makefile.am |   35 +++++++++++++++++
 configure.in              |   94 +++++++++++++++++++++++++++++++++++++++------
 contrib/README            |   13 ++++++
 src/collectd.conf.in      |   41 +++++++++++++++++++
 src/collectd.conf.pod     |   51 ++++++++++++++++++++++++
 src/memcachec.c           |    2 +-
 version-gen.sh            |    2 +-
 10 files changed, 283 insertions(+), 19 deletions(-)

New commits:
commit 54232abc855778f381b96a63b75c1a97240402aa
Merge: 0f74e253aeb26c3b4908fdced0a00c7c1f2ad5cd 568006186417f6b2404790969599f4cd0d2eee22
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon May 11 22:24:58 2009 +0200

    Merge branch 'collectd-4.7'

commit 568006186417f6b2404790969599f4cd0d2eee22
Merge: 818ece50e85249bfda8ff6c1daf7a289ead453a2 5c0fa3a926340546d1f3e807e6fb8a6feae52179
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon May 11 16:18:22 2009 +0200

    Merge remote branch 'tokkee/sh/collectd-4.7' into collectd-4.7

commit 818ece50e85249bfda8ff6c1daf7a289ead453a2
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon May 11 15:13:41 2009 +0200

    bindings/java/Makefile.am: Install to $pkgdatadir/java/.
    
    And don't use $(builddir): It may be an empty string, making handling of this
    variable cumbersome.

commit 5c0fa3a926340546d1f3e807e6fb8a6feae52179
Author: Sebastian Harl <sh at tokkee.org>
Date:   Mon May 11 11:39:00 2009 +0200

    collectd.conf: Added a sample config for the memcachec plugin.
    
    ... copied from the manpage.

commit 522c9cbb3d2223bb70a2e51dd69d55320d2a66a8
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun May 10 21:29:10 2009 +0200

    collectd.conf: Added missing whitespace in sample table configuration.
    
    WTF happened there? ...

commit cb62220826eb2900d4217c5c163c2c1034df2ff2
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun May 10 19:15:37 2009 +0200

    configure: Added support for --enable-<plugin>=force.
    
    This may be used to force a plugin to be built, no matter what the dependency
    check yielded. I.e. this is basically the same --enable-<plugin> before commit
    9276a81328091fdebc833eb10580d53bc51659db (configure.in: Let configure bail out
    on missing dependencies).

commit 2fd1f725afd1e9353e7d5df5c45d1748ee4b1219
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun May 10 18:47:41 2009 +0200

    configure: Added the --enable-all-plugins option.
    
    This option may be used to enable or disable all plugins by default. The
    default may be overwritten by explicitly enabling or disabling a plugin using
    the --enable-<plugin> option.

commit 878fc620d483c3802d39f33964188001bdf952ba
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun May 10 17:58:56 2009 +0200

    memcachec plugin: Fixed a typo in a comment.

commit 0e187c2e852386f767305e69d26fc020fc31d5e8
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon May 11 10:12:46 2009 +0200

    Build system: Build and install .java files in bindings/java/ automatically.

commit 4c415fa7e8a40efc735c55b4abb280cf9e1f4af6
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon May 11 08:52:39 2009 +0200

    collectd.conf(5): Add documentation for the memcachec plugin.

commit cd98f67a14996292f7a186953024e564e1fc0830
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon May 11 08:08:54 2009 +0200

    README: Fix a typo.

commit 29b8c05db28784b74fb36e538c36f824efbf1e53
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun May 10 16:44:06 2009 +0200

    bindings/Makefile: Include java/ subdir in the dist tarball.

commit dad6122b220c0f928ccf036f516b16686b5ecf98
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun May 10 15:42:12 2009 +0200

    contrib/README: Added a short description for collectd-{network,unixsock}.py.

commit 9256582b03a6d47fa0e56517c6b6a93d3ff2d092
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun May 10 15:29:05 2009 +0200

    README: Added missing plugins and libraries.
    
    That is, the fscache, memcachec, table and uptime plugins and libganglia,
    libgcrypt and libmemcached.

commit 98af443c8fc97a795014c6f38cc29d2d0e8a4156
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun May 10 14:23:22 2009 +0200

    collectd.conf: Added fscache, memcachec, table and ted plugins.

commit 3d4a8f9e3dc4e28ec671b7743f29f14fb3347430
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun May 10 13:26:29 2009 +0200

    configure: Sort plugins alphabetically in the summary output.

commit 9567dd514b795f899238f896f0ca07e67ccaf93f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun May 10 17:30:30 2009 +0200

    ChangeLog: Changed date to May 11th; Updated version.

commit 9ce08d6e5e67d89e29a21883bdca5b79d1f908a9
Merge: f71895576cbd4b488cd66f0c96efb6fd3e7a6faf 108068f268cad453e5d3b54e288917409db1e467
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun May 10 17:24:50 2009 +0200

    Merge branch 'collectd-4.6' into collectd-4.7
    
    Conflicts:
    	ChangeLog

commit 108068f268cad453e5d3b54e288917409db1e467
Merge: 37905c5a2370c8e6edae5011978773eeaa589d09 ccd445eab1a68d3b9e2b28a6e5bc95ed0c964d8f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun May 10 17:22:47 2009 +0200

    Merge branch 'collectd-4.5' into collectd-4.6
    
    Conflicts:
    	ChangeLog
    	version-gen.sh

commit ccd445eab1a68d3b9e2b28a6e5bc95ed0c964d8f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat May 9 13:56:43 2009 +0200

    Bumped version to 4.5.4; Updated ChangeLog.