Merge branch 'collectd-5.6' into collectd-5.7
authorFlorian Forster <octo@collectd.org>
Fri, 29 Sep 2017 11:05:26 +0000 (13:05 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 29 Sep 2017 11:05:26 +0000 (13:05 +0200)
commit45492ba3d0119874e2f2878d68089fc8f62268a4
tree07b5838712d7cd81ded07c9e08e736fc638d6608
parent01d23e3f5daf016d03f82d92a76be2fe3decdca4
parent37c73488f93c5423f0816de3d6be759e33fe8b94
Merge branch 'collectd-5.6' into collectd-5.7
src/dbi.c
src/email.c
src/exec.c
src/snmp.c
src/unixsock.c