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

[Florian Forster]

 contrib/redhat/collectd.spec |   68 +++++++++++++++++++++++-------------------
 src/common.c                 |    2 +-
 2 files changed, 39 insertions(+), 31 deletions(-)

New commits:
commit 336ea1e244e6c5d1d8bf8b42774b08c03a932039
Merge: 3f9b877 6d9b6a8
Author: Florian Forster <octo at collectd.org>
Date:   Wed Sep 10 17:15:24 2014 +0200

    Merge branch 'collectd-5.3' into collectd-5.4

commit 6d9b6a8844e6ba3c9bb941809f12d3964997c015
Author: Florian Forster <octo at collectd.org>
Date:   Wed Sep 10 16:54:26 2014 +0200

    src/common.c: Fix strstripnewline().
    
    Because the length of the string was decremented too late, the function
    would actually overwrite the trailing null byte instead of the newline.

commit 3f9b877bf91568f7c1d094cea1485fb5e9e55228
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Mon Sep 8 17:29:14 2014 +0200

    RPM specfile: enable lvm plugin on RHEL7

commit 9f2145dc771af94c7a7c49c20210d6870c7955e7
Merge: ac3fed0 f9cb7ef
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Mon Sep 8 17:21:38 2014 +0200

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

commit f9cb7ef9c5b2d846146e5dd1cbc894b5139c47cc
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Mon Sep 8 16:59:30 2014 +0200

    RPM specfile: enable netlink plugin on RHEL > 5

commit 8d3f6c33dd6df8c2988e60b0488775ce074b6393
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Mon Sep 8 16:42:14 2014 +0200

    RPM specfile: fix bogus dates
    
    modern rpmbuild versions appear to be more strict on this point.

commit 33a97ea2e78ccb2a273e726d4b5fcaab3ff11bad
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Mon Sep 8 16:41:21 2014 +0200

    RPM specfile: support for RHEL7

commit 0e57c2db6f7649d93b00b5f335c37c3a8e33348f
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Mon Sep 8 14:12:51 2014 +0200

    RPM specfile: add missing %files section for modbus plugin
    
    complement to a781eb2c5

commit ac3fed091af7e3694623479c49728417210af56e
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Mon Sep 8 12:49:49 2014 +0200

    RPM specfile: remove define accidentally re-added when handling merge conflict

commit d538a332dd0551a12360185e920e8a6391eddbac
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Mon Sep 8 12:38:53 2014 +0200

    RPM specfile: remove macro accidentally re-added when handling merge conflict

commit f3d7bacfcef006e1761d16b08c98f3dc6fb9d2cb
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Mon Sep 8 12:26:55 2014 +0200

    RPM specfile: remove duplicate modbus block