Code

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)
1  2 
src/collectd.conf.in
src/collectd.conf.pod
src/netapp.c
src/openldap.c
src/rrdtool.c

Simple merge
Simple merge
diff --cc src/netapp.c
Simple merge
diff --cc src/openldap.c
Simple merge
diff --cc src/rrdtool.c
Simple merge