[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a89b7f8 38f1d84)
Auto-Merge pull request #2113 from rubenk/dpdk-double-close
authorFlorian Forster <ff@octo.it>
Mon, 19 Dec 2016 08:09:05 +0000 (09:09 +0100)
committerGitHub <noreply@github.com>
Mon, 19 Dec 2016 08:09:05 +0000 (09:09 +0100)
Automatically merged due to "Automerge" label

1  2 
src/dpdkstat.c patch | diff1 | diff2 | blob | history

diff --cc src/dpdkstat.c
Simple merge
statistics collection and monitoring daemon (clone)