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

[Florian Forster]

Rebased ref, commits from common ancestor:
commit 7186f6716d2c588a3bdb19d849a99380db1f3081
Author: Florian Forster <octo at collectd.org>
Date:   Wed Sep 10 16:53:51 2014 +0200

    battery plugin: Import code to read metrics from sysfs.
    
    This started as a simple import of Andy Parkins' sysfsbattery plugin into
    the battery plugin. Since the battery plugin is ancient and hasn't been
    touched in a while, this quickly escalated to a much bigger refactoring.
    Sorry!
    
    On the other hand, this fixes a couple of bugs. For example, all metrics
    were always dispatched with plugin_instance "0". This is correct for the
    majority of laptops, of course, but in theory this could be wrong.
    
    Also ACPI charging / discharging rate is reported as "current", when
    modern batteries actually report "power". The sysfs code does this
    correctly, ACPI still needs to be patched.
    
    Fixes: #725

commit 9901983046c6a4e2793c060b3c10b4c7d467f813
Author: Florian Forster <octo at collectd.org>
Date:   Wed Sep 10 16:15:40 2014 +0200

    src/common.[ch]: Implement strtogauge().

commit 3281172053c295f958c5e2fa6e8a4ffa3b8d0565
Author: Florian Forster <octo at collectd.org>
Date:   Tue Sep 9 23:43:11 2014 +0200

    src/configfile.c: Fix the default interval setting.
    
    Also fixes a bug in global_option_get_time(): Values smaller than or
    equal to zero are illegal and the default value should be returned.
    Thanks to @anandkarthik for spotting this!
    
    Fixes: #727

commit ecd14a913df7d36335c59a0c56348517ed2c6a3a
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Mon Sep 8 15:10:18 2014 +0200

    RPM specfile: take all new plugins and dependencies in account

commit e30c4b09f2ba06ed279d7ddfdc3714e1b3ab3a06
Merge: 67411e0 3f9b877
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Mon Sep 8 17:32:54 2014 +0200

    Merge branch 'collectd-5.4'

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