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

[Florian Forster]

 src/disk.c           |   20 ++++++++++++++------
 src/network.c        |   17 ++++++++++++++---
 src/utils_db_query.c |   14 +++++++-------
 src/utils_db_query.h |    6 +++---
 4 files changed, 38 insertions(+), 19 deletions(-)

New commits:
commit 2979ae00227051ea79c9294ebfaf8337e8e308e2
Merge: 9e895cf a60550f
Author: Florian Forster <octo at collectd.org>
Date:   Thu Oct 18 12:49:44 2012 +0200

    Merge branch 'collectd-5.1'

commit a60550f0b85d413957654546a87f00a95e59a26c
Merge: a5dac90 4005961
Author: Florian Forster <octo at collectd.org>
Date:   Thu Oct 18 12:49:39 2012 +0200

    Merge branch 'collectd-5.0' into collectd-5.1

commit 400596160704146845940d7d9c4f794c0d2ddc03
Merge: ab6ab6a b3c87d5
Author: Florian Forster <octo at collectd.org>
Date:   Thu Oct 18 12:43:30 2012 +0200

    Merge branch 'collectd-4.10' into collectd-5.0
    
    Conflicts:
    	src/utils_db_query.c
    	src/utils_db_query.h

commit b3c87d5576e385a407081f86c9a3b84fa6983c0f
Author: Florian Forster <octo at collectd.org>
Date:   Wed Oct 17 16:08:07 2012 +0200

    disk plugin: Multiply the average read/write latency with the interval.
    
    The counter/derive will later be divided by the interval, resulting in too
    small rates (for interval > 1.0).
    
    Should fix issue #150. Thanks to Manuel Sanmartin for identifying this problem!

commit ae76b092e5836b9c3ca0267896e6b439e6ea8c2c
Author: Chris Lundquist <chris.lundquist at bluebox.net>
Date:   Wed Oct 10 17:04:26 2012 -0700

    network.c: workaround for broken OSX compilers issuing false warnings
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit 9039795bcb798f5ad7399afc16ef6770316a878e
Author: Florian Forster <octo at collectd.org>
Date:   Thu Oct 11 21:52:36 2012 +0200

    src/utils_db_query.[ch]: Remove duplicate "const" modifier.