Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Sat, 1 Aug 2015 07:30:22 +0000 (09:30 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Sat, 1 Aug 2015 07:30:22 +0000 (09:30 +0200)
commit8c864f5e634118fce2446ebbba96a1cb7ec39dda
tree4a7b967689b69c9d88fb1e44ecc016d21ca7d0eb
parent9dcc5ed7899022e170fc86e661f619fa9acdd8cf
parentec641aeb851d34295e8453d40596759039787339
Merge branch 'collectd-5.4' into collectd-5.5
src/Makefile.am
src/collectd-nagios.c
src/collectd.conf.pod
src/daemon/collectd.c
src/daemon/configfile.c
src/daemon/plugin.c
src/daemon/utils_cache.c
src/gmond.c
src/liboconfig/scanner.l
src/memcached.c