]> git.tokkee.org Git - collectd.git/commitdiff
[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03d8ea0 f2391b9)
Merge branch 'collectd-4.10' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Thu, 30 May 2013 06:10:42 +0000 (08:10 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 30 May 2013 06:10:42 +0000 (08:10 +0200)
1  2 
src/mysql.c patch | diff1 | diff2 | blob | history

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