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

[Florian Forster]

 src/java.c               |    2 --
 src/liboconfig/oconfig.c |   11 +++++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 55ebefc8321c4a1c54492bdec8a972426758c658
Merge: b99f2ef ec9b92a
Author: Florian Forster <octo at collectd.org>
Date:   Tue May 19 10:45:57 2015 +0200

    Merge remote-tracking branch 'github/pr/1027'

commit ec9b92a7dc86c01156e3a132cbc591fc7d746226
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Tue May 12 22:40:27 2015 +0200

    oconfig: fix oconfig_free to free all elements
    
    The recursive nature of this function made it difficult to free the root
    node of the config tree. Splitting it in 2 allows to work around this
    problem.