projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08a2128 a5e8962)
Merge branch 'collectd-5.5'
authorFlorian Forster <octo@collectd.org>
Mon, 13 Jul 2015 10:09:55 +0000 (12:09 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 13 Jul 2015 10:09:55 +0000 (12:09 +0200)
1  2 
src/varnish.c patch | diff1 | diff2 | blob | history

diff --cc src/varnish.c
Simple merge
collectd, the system statistics collection daemon