Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Sat, 1 Aug 2015 07:34:28 +0000 (09:34 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Sat, 1 Aug 2015 07:34:28 +0000 (09:34 +0200)
commite460da6b5715e55c57731dcda31a228502b02b5b
treec6e2ef102b8b7fb82a06746407fc8abd0e9d7bb2
parent1d3ed298b5454ea71a0995f4d99048279944bc62
parent8c864f5e634118fce2446ebbba96a1cb7ec39dda
Merge branch '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/memcached.c