Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 1 Mar 2016 11:47:25 +0000 (12:47 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 1 Mar 2016 11:47:25 +0000 (12:47 +0100)
commitb24fe01f603e1422de29c2cf090eabb043df1965
treed8ce326be7bd9986144bf5406469ec69b11ca967
parent160fb4929496d00c3190be9e2c01bc16062cabf0
parent383173f48def3adc882710b6ceeacd87c7b635c6
Merge branch 'collectd-5.5'
src/barometer.c
src/daemon/collectd.c
src/daemon/plugin.h
src/daemon/utils_cache.c
src/redis.c
src/write_riemann.c
src/write_riemann_threshold.c
src/write_sensu.c