[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7fd4607 15037c9)
Merge branch 'collectd-4.10' into collectd-5.3
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 22 Apr 2015 06:46:00 +0000 (08:46 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 22 Apr 2015 06:46:00 +0000 (08:46 +0200)
1  2 
src/meta_data.c patch | diff1 | diff2 | blob | history

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