projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 004074a 6cb7fdc)
Merge branch 'collectd-5.6' into collectd-5.7
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 24 Feb 2017 16:44:55 +0000 (17:44 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 24 Feb 2017 16:44:55 +0000 (17:44 +0100)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/daemon/common.c patch | diff1 | diff2 | blob | history
src/daemon/common.h patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc src/daemon/common.c
Simple merge
diff --cc src/daemon/common.h
Simple merge
collectd, the system statistics collection daemon