![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Tue, 10 May 2016 09:52:36 +0000 (11:52 +0200) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Tue, 10 May 2016 09:52:36 +0000 (11:52 +0200) | ||
| commit | 56536633afb68ded68ac7bd012060cb9337fbcc5 | |
| tree | dfae0cb744a6a325cba922f49ebf2265eb24064e | tree | snapshot |
| parent | 00f086d5165423665476c7ffe5c9c47b1497fb34 | commit | diff |
| parent | 70cb50ea9a7aa0554c3874862192b5ca3b1283d5 | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
Conflicts:
src/Makefile.am
Conflicts:
src/Makefile.am
| configure.ac | diff1 | | diff2 | | blob | history |
| src/Makefile.am | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/curl.c | diff1 | | diff2 | | blob | history |
| src/curl_json.c | diff1 | | diff2 | | blob | history |
| src/curl_xml.c | diff1 | | diff2 | | blob | history |
| src/processes.c | diff1 | | diff2 | | blob | history |
| src/statsd.c | diff1 | | diff2 | | blob | history |