![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Tue, 26 Jul 2016 10:50:07 +0000 (12:50 +0200) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Tue, 26 Jul 2016 10:50:07 +0000 (12:50 +0200) | ||
| commit | dc2eb041159b967838a2eb658cb256bc846c5264 | |
| tree | abc65a1c54795b53247db0c53da41c515f358e35 | tree | snapshot |
| parent | 3c2be75d51fc6a72ae765c54101eb85f43d3b41a | commit | diff |
| parent | 92915087fd253244d323ff88cd97c54367689030 | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
Conflicts:
ChangeLog
contrib/redhat/collectd.spec
version-gen.sh
Conflicts:
ChangeLog
contrib/redhat/collectd.spec
version-gen.sh
| ChangeLog | diff1 | | diff2 | | blob | history |
| src/daemon/meta_data.c | diff1 | | | | blob | history |
| src/network.c | diff1 | | diff2 | | blob | history |