Code

Merge branch 'collectd-5.7' into collectd-5.8
authorFlorian Forster <octo@collectd.org>
Fri, 17 Nov 2017 12:18:00 +0000 (13:18 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 17 Nov 2017 12:18:00 +0000 (13:18 +0100)
commit7c2336dde35a7b42853b6ca167d4164619e52333
tree950073b173e02cfb2b614c70088e5dd0e5a704b0
parent1f684bf755acedd26fd0ff18f8cbc5fa0e2b15fc
parent6b91766963f80e75cbbb3f17fbdf357f80e7c7b6
Merge branch 'collectd-5.7' into collectd-5.8
src/collectd.conf.in
src/collectd.conf.pod
src/daemon/meta_data.c