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)
commit4ac3040668e7a9b595edd334a9179a5f6ae42461
tree6b922fd5c165d81f88318a6f7e72335a85fe847c
parentb758f3b7146f1497d93e1df64cbc0c14ae164768
parent1fc00932fd49fa535551cc4bba09c4e4be059ab4
Merge branch 'collectd-5.5'
src/ceph.c
src/daemon/plugin.c
src/processes.c
src/python.c