Merge branch 'collectd-5.6' into collectd-5.7
authorFlorian Forster <octo@collectd.org>
Thu, 21 Sep 2017 15:22:39 +0000 (17:22 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 21 Sep 2017 15:22:39 +0000 (17:22 +0200)
commit01d23e3f5daf016d03f82d92a76be2fe3decdca4
tree71fd7f4c9454e596727133e5b0e61c3c75eff781
parent8339b50c3c2c4ca61e87a43a62c23bd53271a4ad
parent6c082e955466f0c451d608fb3cbb31481c02fa37
Merge branch 'collectd-5.6' into collectd-5.7
contrib/redhat/collectd.spec
src/network.c
src/ntpd.c
src/perl.c