Code

Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 11 Dec 2015 20:56:40 +0000 (21:56 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 11 Dec 2015 20:56:40 +0000 (21:56 +0100)
commit59547eb66a3743ca0b458222d7a4318f3e659a60
treed4927201e8eb48cbfafaf946fc88719ba6c5c98d
parent0657d95eaa686d64efe6bbccda346ebd6467bd0b
parent9fd3d670c4e85d840e618647c15b64d728a3f193
Merge branch 'collectd-5.4' into collectd-5.5
src/daemon/utils_ignorelist.c
src/swap.c