projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e38483 4cfce92)
Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 7 Aug 2015 08:14:17 +0000 (10:14 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 7 Aug 2015 08:14:17 +0000 (10:14 +0200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/routeros.c patch | diff1 | diff2 | blob | history

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