Update to resolve conflicts due to renamed files
authorusev6 <use_v6@aglaz.de>
Mon, 29 Apr 2019 18:03:14 +0000 (20:03 +0200)
committerusev6 <use_v6@aglaz.de>
Mon, 29 Apr 2019 18:03:14 +0000 (20:03 +0200)
commit7045c4b543304ffabaa30a2ca9183489e75eafe3
tree9b096faa2735488f4dc4cb7998c62c6b360abb65
parent3accc892f047146145d93791ec1246515fe308ba
parent00d5fc4af0f1750cbaddaab8c7e29907840e3f7f
Update to resolve conflicts due to renamed files

Merge branch 'master' into write_graphite_reverse_host
src/collectd.conf.in
src/collectd.conf.pod
src/utils/format_graphite/format_graphite.c
src/utils/format_graphite/format_graphite.h
src/write_graphite.c