Code

Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 12 Jan 2016 08:03:09 +0000 (09:03 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 12 Jan 2016 08:03:09 +0000 (09:03 +0100)
1  2 
src/collectd.conf.in
src/collectd.conf.pod
src/curl_json.c
src/email.c
src/libcollectdclient/network.c
src/openvpn.c
src/perl.c
src/snmp.c

Simple merge
Simple merge
diff --cc src/curl_json.c
Simple merge
diff --cc src/email.c
Simple merge
Simple merge
diff --cc src/openvpn.c
Simple merge
diff --cc src/perl.c
Simple merge
diff --cc src/snmp.c
Simple merge