![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Sat, 1 Aug 2015 07:30:22 +0000 (09:30 +0200) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Sat, 1 Aug 2015 07:30:22 +0000 (09:30 +0200) | ||
| commit | 8c864f5e634118fce2446ebbba96a1cb7ec39dda | |
| tree | 4a7b967689b69c9d88fb1e44ecc016d21ca7d0eb | tree | snapshot |
| parent | 9dcc5ed7899022e170fc86e661f619fa9acdd8cf | commit | diff |
| parent | ec641aeb851d34295e8453d40596759039787339 | commit | diff |
Merge branch 'collectd-5.4' into 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 | | | | blob | history |
| src/daemon/configfile.c | diff1 | | | | blob | history |
| src/daemon/plugin.c | diff1 | | | | blob | history |
| src/daemon/utils_cache.c | diff1 | | | | blob | history |
| src/gmond.c | diff1 | | diff2 | | blob | history |
| src/liboconfig/scanner.l | diff1 | | diff2 | | blob | history |
| src/memcached.c | diff1 | | diff2 | | blob | history |