Merge branch 'collectd-5.6' into collectd-5.7
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 7 Jul 2017 16:40:55 +0000 (18:40 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 7 Jul 2017 16:40:55 +0000 (18:40 +0200)
1  2 
src/apache.c
src/ascent.c
src/bind.c
src/curl.c
src/curl_json.c
src/curl_xml.c
src/nginx.c
src/write_http.c

diff --cc src/apache.c
Simple merge
diff --cc src/ascent.c
Simple merge
diff --cc src/bind.c
Simple merge
diff --cc src/curl.c
Simple merge
diff --cc src/curl_json.c
Simple merge
diff --cc src/curl_xml.c
Simple merge
diff --cc src/nginx.c
Simple merge
Simple merge