projects / collectd.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9d15d10 b3315d5)
Merged branch 'sh/collectd-4.6' into sh/collectd-4.7.
authorSebastian Harl <sh@tokkee.org>
Sun, 6 Sep 2009 12:52:15 +0000 (12:52 +0000)
committerSebastian Harl <sh@tokkee.org>
Sun, 6 Sep 2009 12:52:15 +0000 (12:52 +0000)
commit658c85755ef1f4284228d1e5edbc4452a31bd944
tree61b4f669d776b2cfda87da48c9f81bfd0160a51ctree | snapshot
parent9d15d1058b93acb7be041934acfe76548539041acommit | diff
parentb3315d59fb67edf77cfd90519c750ae1ce7e4146commit | diff
Merged branch 'sh/collectd-4.6' into sh/collectd-4.7.

Conflicts:
src/iptables.c

To resolve the conflict, the changes to the iptables plugin have been updated
to support ip6tc as well.
configure.in diff1 | diff2 | blob | history
src/iptables.c diff1 | diff2 | blob | history
collectd, the system statistics collection daemon