![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 24 Mar 2015 06:00:35 +0000 (07:00 +0100) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 24 Mar 2015 06:00:35 +0000 (07:00 +0100) | ||
| commit | 491b8f0185c63c662bb3f395630a6d8b9913b49e | |
| tree | 4982713dae8305c9f4df5d885a5ce05806ba0563 | tree | snapshot |
| parent | 0ea3dd8c7e3df6a0cac20be4c70f3f6a7433a041 | commit | diff |
| parent | 257877038f937becbcc9075d4ee0c4ea48c8671b | commit | diff |
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
contrib/redhat/collectd.spec
src/collectd.conf.pod
Conflicts:
contrib/redhat/collectd.spec
src/collectd.conf.pod
| src/collectd.conf.in | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |