Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 6 Nov 2015 08:42:11 +0000 (09:42 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 6 Nov 2015 08:42:11 +0000 (09:42 +0100)
commit83bd4369fc36851bb9a92d0dd3a9d3bc6a408fdd
tree904ca2a9d5aed0bd2866930fac5fdc8545f70194
parent6fa9a91c383a96f5e857239946590b8ff1ffe519
parent142fb2ea490118e62f34df41f907ef1e58fb0be4
Merge branch 'collectd-5.5'
src/apcups.c
src/collectd.conf.in
src/types.db