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

[Florian Forster]

 .../collectd/java/GenericJMXConfConnection.java    |    2 -
 contrib/redhat/collectd.spec                       |   11 ++--
 src/collectd.conf.in                               |    2 +-
 src/java.c                                         |   64 ++++++--------------
 4 files changed, 26 insertions(+), 53 deletions(-)

New commits:
commit 1894607dc4c03ce20db7c5256c97890aa70bcaa5
Merge: 7de87be 1c4c70a
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Fri Aug 29 17:26:41 2014 +0200

    Merge branch 'collectd-5.3' into collectd-5.4
    
    Conflicts:
    	contrib/redhat/collectd.spec

commit 1c4c70a4d273bde66f744b969fe02e87b149e92e
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Fri Aug 29 17:20:57 2014 +0200

    RPM specfile: update changelog without incrementing release number

commit e2f2a97fd838047ae4d9d4e331f11d104761bbdf
Author: Florian Forster <octo at google.com>
Date:   Thu Aug 28 20:55:45 2014 +0200

    GenericJMXConfConnection: Remove unused imports.

commit 513a5cafb5c18c375d1f7206adeee7cb5cb6251c
Author: Florian Forster <octo at google.com>
Date:   Thu Aug 28 20:41:25 2014 +0200

    java plugin: Make sure cjni_thread_detach() is called on all paths.
    
    Each call to cjni_thread_attach() much be accompanied by
    a call to cjni_thread_detach(). Some error handling cases were missing
    the call, potentially locking the plugin up.

commit b14c25da066052f9f8001880c8fd57f14539ec5e
Author: Kevin Bowling <kevin.bowling at kev009.com>
Date:   Thu Aug 14 02:30:45 2014 -0700

    EL <6 provide perl-ExtUtils-Embed with base perl
    
    Conflicts:
    	contrib/redhat/collectd.spec

commit 1401d6563b0030422128c3ef84be639e38ce8f9e
Author: Florian Forster <octo at collectd.org>
Date:   Mon Aug 18 09:58:34 2014 +0200

    collectd.conf: Fix default packet size of the network plugin.
    
    Fixes: #710