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

[Florian Forster]

 src/collectd.conf.pod |    9 ++++++
 src/curl.c            |    2 +-
 src/df.c              |   77 +++++++++++++++++++++++++++++++++++++++----------
 3 files changed, 72 insertions(+), 16 deletions(-)

New commits:
commit 42612558ff8279a80e32cc68d26b1b1bee800f4f
Merge: 7e2a10e 14fcf8a
Author: Florian Forster <octo at collectd.org>
Date:   Sat Jun 1 09:25:28 2013 +0200

    Merge branch 'yaccz/curl-status'

commit 7e2a10e78c6fd263d0360bf929158dc1b2257704
Merge: b5c2af0 e4fcf03
Author: Florian Forster <octo at collectd.org>
Date:   Sat Jun 1 09:25:19 2013 +0200

    Merge branch 'vb/df'

commit 14fcf8a4f648e6ed2ff5f2bc8d4f70057702b17e
Author: Florian Forster <octo at collectd.org>
Date:   Sat Jun 1 09:23:04 2013 +0200

    curl plugin: Fix compiler warning.
    
    The compiler thinks the "start" variable may be used uninitialized.

commit e4fcf03ee7504cc679b5463700966519fb85f065
Author: Florian Forster <octo at collectd.org>
Date:   Sat Jun 1 09:20:59 2013 +0200

    collectd.conf(5): Minor fixes.

commit a6ea8a31f4f27655640f7a517d2b157fa8fc62d7
Author: Florian Forster <octo at collectd.org>
Date:   Sat Jun 1 09:19:07 2013 +0200

    df plugin: Rename the percent metrics.
    
    * Change type to "percent".
    * Use "<disk>-bytes" and "<disk>-inodes" as plugin instance. This way we're
      able to use "percent" for both.
    * Remove one level of indentation.
    * Make casting more explicit (e.g. don't divide a float by a size_t).

commit 2cef48ae374f267e46c9c4219c97919e04f5b0a7
Author: Florian Forster <octo at collectd.org>
Date:   Fri May 31 18:18:40 2013 +0200

    df plugin: Remove trailing whitespace.
    
    And fix indentation.

commit c07ccc0a97187cf6e7a9c95a2b1dd01a6f19e205
Author: Vedran Bartonicek <vbartoni at gmail.com>
Date:   Fri May 31 13:40:59 2013 +0300

    Plugin df: ReportPercentage

commit f536639a66dc1bcb7a502561bf9260edf7ecc5c6
Author: Vedran Bartonicek <vbartoni at gmail.com>
Date:   Mon May 27 22:42:08 2013 +0300

    Plugin df free space as percentage.
    
    Signed-off-by: Florian Forster <octo at collectd.org>