![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Fri, 29 Aug 2014 15:26:41 +0000 (17:26 +0200) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Fri, 29 Aug 2014 15:26:41 +0000 (17:26 +0200) | ||
| commit | 1894607dc4c03ce20db7c5256c97890aa70bcaa5 | |
| tree | b41878f872bf8e57cf5e1c357b050d93b34aa842 | tree | snapshot |
| parent | 7de87be6f679d23cc311250559813e3b2db64795 | commit | diff |
| parent | 1c4c70a4d273bde66f744b969fe02e87b149e92e | commit | diff |
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
contrib/redhat/collectd.spec
Conflicts:
contrib/redhat/collectd.spec
| contrib/redhat/collectd.spec | diff1 | | diff2 | | blob | history |
| src/collectd.conf.in | diff1 | | diff2 | | blob | history |