Merge pull request #1634 from BrandonArp/add_write_http_headers

author Ruben Kerkhof <ruben@rubenkerkhof.com>

Fri, 15 Apr 2016 18:40:11 +0000 (20:40 +0200)

committer Ruben Kerkhof <ruben@rubenkerkhof.com>

Fri, 15 Apr 2016 18:40:11 +0000 (20:40 +0200)
author Ruben Kerkhof <ruben@rubenkerkhof.com>
Fri, 15 Apr 2016 18:40:11 +0000 (20:40 +0200)
committer Ruben Kerkhof <ruben@rubenkerkhof.com>
Fri, 15 Apr 2016 18:40:11 +0000 (20:40 +0200)
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/write_http.c
Simple merge
author	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Fri, 15 Apr 2016 18:40:11 +0000 (20:40 +0200)
committer	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Fri, 15 Apr 2016 18:40:11 +0000 (20:40 +0200)
		1	2
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/write_http.c	patch \|	diff1 \|	diff2 \|	blob \| history