Code

Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 4 Mar 2016 11:19:47 +0000 (12:19 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 4 Mar 2016 11:19:47 +0000 (12:19 +0100)
1  2 
src/ceph.c
src/daemon/plugin.c
src/processes.c
src/python.c

diff --cc src/ceph.c
Simple merge
Simple merge
diff --cc src/processes.c
Simple merge
diff --cc src/python.c
Simple merge