Code

Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 26 Jul 2016 10:50:07 +0000 (12:50 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 26 Jul 2016 10:50:07 +0000 (12:50 +0200)
commitdc2eb041159b967838a2eb658cb256bc846c5264
treeabc65a1c54795b53247db0c53da41c515f358e35
parent3c2be75d51fc6a72ae765c54101eb85f43d3b41a
parent92915087fd253244d323ff88cd97c54367689030
Merge branch 'collectd-5.4' into collectd-5.5

Conflicts:
ChangeLog
contrib/redhat/collectd.spec
version-gen.sh
ChangeLog
src/daemon/meta_data.c
src/network.c