Merge pull request #695 from mfournier/curlopt_username-fixups
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 1 Sep 2014 08:29:34 +0000 (10:29 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 1 Sep 2014 08:29:34 +0000 (10:29 +0200)
Allow curl digest feature to build against older libcurl versions

1  2 
configure.ac
src/collectd.conf.in
src/collectd.conf.pod
src/curl.c
src/curl_json.c
src/curl_xml.c

diff --cc configure.ac
Simple merge
Simple merge
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