![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Thu, 20 Jul 2017 07:11:09 +0000 (09:11 +0200) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Thu, 20 Jul 2017 07:11:09 +0000 (09:11 +0200) | ||
| commit | 96b920e6b7bf70560eb95c911202afbeaab2b965 | |
| tree | f91936d0fa143122f740133ec4849f11e183c30e | tree | snapshot |
| parent | 01761867ced7bc5fe71546baf350be4a3e800600 | commit | diff |
| parent | 2739b2c65f22e459d947bdd10cb9a9807ca729e8 | commit | diff |
Merge branch 'collectd-5.6' into collectd-5.7
Conflicts:
src/rrdtool.c
Conflicts:
src/rrdtool.c
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/rrdtool.c | diff1 | | diff2 | | blob | history |