Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 4 Mar 2016 11:19:15 +0000 (12:19 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 4 Mar 2016 11:19:15 +0000 (12:19 +0100)
commit1fc00932fd49fa535551cc4bba09c4e4be059ab4
tree701daafab146a627665016acfe79fcaff9c705ee
parent9de86bc9ce5961281632944a04efbc2314828a2f
parentf8379dd45f4a43595f4027992696ee8d02908bff
Merge branch 'collectd-5.4' into collectd-5.5
src/daemon/plugin.c
src/processes.c
src/python.c
src/tokyotyrant.c