Merge branch 'collectd-5.5'
authorFlorian Forster <octo@collectd.org>
Mon, 30 Nov 2015 10:35:40 +0000 (11:35 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 30 Nov 2015 10:37:10 +0000 (11:37 +0100)
commit4b8c1289003f0d60728f06a43bfcc9bc3de7004c
tree8fd5cb8ddd8c2720924449a66c216c0b7d543941
parent3ef1caf24c8030e5703ff86e42268834d08a467b
parentbb715b67ca90d28ad8b69c08689673a9680271de
Merge branch 'collectd-5.5'
src/Makefile.am
src/ceph.c
src/daemon/plugin_mock.c
src/snmp.c