Merge branch 'collectd-5.7'
authorFlorian Forster <octo@collectd.org>
Thu, 8 Dec 2016 14:42:05 +0000 (15:42 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 8 Dec 2016 14:42:05 +0000 (15:42 +0100)
commitc6baff42e7e8e547eb7ca7817c0e0e07ccea95db
treea08922e20bc11dedae944be622296cc8b5bc420f
parent27d117edf8dd7ae0b0f85772361f3df7ac933ae6
parent3fb6fe5776c14f41879249f4147c0b8924b39cc1
Merge branch 'collectd-5.7'
src/Makefile.am
src/collectd.conf.pod
src/utils_cmd_flush.c
src/utils_cmd_flush.h