Code

Merge branch 'collectd-4.4' into collectd-4.5
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 3 Oct 2008 21:14:44 +0000 (23:14 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 3 Oct 2008 21:14:44 +0000 (23:14 +0200)
commitb2a7cb85e09f67cbaf114eb64bf736f3a24d9d55
tree01b5a0ca744fc3447b34682c9f6c0c21c2bf474a
parentee9507500f738d21858f76128501772d212c069c
parente0df7ed3f1a6bc3d9164dde7f25b8ed582388a9b
Merge branch 'collectd-4.4' into collectd-4.5

Conflicts:

src/utils_ignorelist.c
src/collectd.conf.pod
src/ipvs.c
src/utils_ignorelist.c