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

[Florian Forster]

 src/collectd.conf.in  |    1 +
 src/collectd.conf.pod |    9 +++++++--
 src/table.c           |    8 +++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 4d651bf30af5408da82e753b6232fc64dcba96db
Merge: 1b10ab7 0b3c116
Author: Florian Forster <octo at collectd.org>
Date:   Thu Sep 21 19:59:46 2017 +0200

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

commit 0b3c11624c7102fd59a16f53fc9165554783652b
Author: Pavel Rochnyack <pavel2000 at ngs.ru>
Date:   Thu Sep 21 13:24:14 2017 +0700

    table: Allow custom plugin name to be reported