![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Sat, 1 Aug 2015 07:34:28 +0000 (09:34 +0200) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Sat, 1 Aug 2015 07:34:28 +0000 (09:34 +0200) | ||
| commit | e460da6b5715e55c57731dcda31a228502b02b5b | |
| tree | c6e2ef102b8b7fb82a06746407fc8abd0e9d7bb2 | tree | snapshot |
| parent | 1d3ed298b5454ea71a0995f4d99048279944bc62 | commit | diff |
| parent | 8c864f5e634118fce2446ebbba96a1cb7ec39dda | commit | diff |
Merge branch 'collectd-5.5'
| src/Makefile.am | diff1 | | diff2 | | blob | history |
| src/collectd-nagios.c | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/daemon/collectd.c | diff1 | | diff2 | | blob | history |
| src/daemon/configfile.c | diff1 | | diff2 | | blob | history |
| src/daemon/plugin.c | diff1 | | diff2 | | blob | history |
| src/daemon/utils_cache.c | diff1 | | diff2 | | blob | history |
| src/gmond.c | diff1 | | diff2 | | blob | history |
| src/memcached.c | diff1 | | diff2 | | blob | history |