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

[Florian Forster]

 src/utils_heap.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit d1c3baabf0c7bf65f699fb66db5b2aea92d1f5e7
Merge: 959e4e77abe00cd4e081a6555df00cbde86e0ce8 97addf1e406c75be500ae020635f3cb389f206e0
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Aug 19 15:02:48 2010 +0200

    Merge branch 'collectd-4.10'

commit 97addf1e406c75be500ae020635f3cb389f206e0
Merge: c15dbfc3739f7c3bbd8171797eaef55749008bfa 69149f2f18463f82a567ca27ff1eb2fc4bb8dc3d
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Aug 19 15:02:41 2010 +0200

    Merge branch 'collectd-4.9' into collectd-4.10

commit 69149f2f18463f82a567ca27ff1eb2fc4bb8dc3d
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Aug 19 15:00:26 2010 +0200

    src/utils_heap.c: Fix calculation of the parent's index.
    
    This resulted in the "upwards" reheap function to return prematurely,
    leaving the heap condition violated.