Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 12 Jan 2016 13:02:23 +0000 (14:02 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 12 Jan 2016 13:02:23 +0000 (14:02 +0100)
commit4d6ff066b1c60a8e6654e4c74370ef951f37b5f3
treec6b227f0ad4242e0aae3cdd6e3cd49aea5355ae6
parent25888de8d7881514ce4854e39f322ad4240e3d13
parent40e77dd34f9a8466165a8b7d724faeb337c90414
Merge branch 'collectd-5.5'
src/collectd.conf.in
src/collectd.conf.pod
src/netapp.c
src/openldap.c
src/rrdtool.c