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

[Florian Forster]

 configure.in    |   13 +++++++++----
 src/Makefile.am |    2 +-
 src/plugin.c    |    3 +++
 src/rrdtool.c   |    5 +++++
 4 files changed, 18 insertions(+), 5 deletions(-)

New commits:
commit e40c5242ad2ad284425bef8bb0958510c36c7870
Merge: f87848cbbce9283bf6e966624ec7e25b37993ad5 5a7145dd5626503f411a4aed87f30fc0f9689c90
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed May 20 11:02:17 2009 +0200

    Merge branch 'collectd-4.7'

commit 5a7145dd5626503f411a4aed87f30fc0f9689c90
Merge: de23afd8e6b61c4e665e55b2700381582ae4c708 f331f9975e8d90a8c430ee7c739c4c3ed8bbb1ec
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed May 20 11:02:06 2009 +0200

    Merge branch 'collectd-4.6' into collectd-4.7

commit f331f9975e8d90a8c430ee7c739c4c3ed8bbb1ec
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon May 18 14:42:39 2009 +0200

    rrdtool plugin: Make sure the initialization is run only once.
    
    Thanks to Amit Gupta for reporting this bug!

commit b235b6a85baf902d4c8e11095310f20462c103a2
Author: Andrés J. Díaz <ajdiaz at connectical.com>
Date:   Mon May 18 14:09:11 2009 +0200

    src/plugin.c: Initiate the threshold checking again.
    
    Hi,
    
    I have the same problem in my instalation, exactly the same scenario, I found a
    possible explanation in the plugin.c module. While in the 4.5 branch exists a
    callback to function ut_check_threshold (defined in utils_threshold.c), in the
    4.6.2 (and also in 4.6.1, I think), the callback is missing, so threshold
    checking never runs.
    
    In fact, a grep -r ut_check_threshold over src dir, only show the definition of
    the function in ut_check_threshold module.
    
    I'm not sure if it's really a bug, but when I patched my code, it works fine
    for me :) I'm using the 4.6.2 version from tar.gz.
    
    Best regards,
      Andrés
    
    The regression was introduced in 65954d9b.
    
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 7075d42e9dfe63db797a5b124f84dea55d17c7eb
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon May 18 13:05:26 2009 +0200

    configure.in: Be more verbose if libperl exists but doesn't support ithreads.

commit de23afd8e6b61c4e665e55b2700381582ae4c708
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon May 18 11:28:50 2009 +0200

    configure.in, java plugin: Instruct `find' to return files only.
    
    Hopefully this solves this problem:
      /home/hudson/jdk/sample/javac -d "." "./org/collectd/api"/*.java
      /bin/sh: /home/hudson/jdk/sample/javac: is a directory

commit 6b89dd24f42ea2ee6ac5ce05a2fb3f18ea5331aa
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue May 12 08:44:24 2009 +0200

    src/Makefile.am: Added missing backslash before newline.
    
    The list of manpages is split into several lines. One of those lines was
    missing the backslash which caused the list to be cut after collectd-java.5,
    i.e. several of the manpages would have not been built at all.
    
    Thanks to 'dh_install --fail-missing' for catching that ;-)