projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bca0f0a 5e6230c)
Merge branch 'feature/ZOL'
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 22 Aug 2014 21:22:34 +0000 (23:22 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 22 Aug 2014 21:22:34 +0000 (23:22 +0200)
Conflicts:
configure.ac

1  2 
AUTHORS patch | diff1 | diff2 | blob | history
configure.ac patch | diff1 | diff2 | blob | history
contrib/redhat/collectd.spec patch | diff1 | diff2 | blob | history
src/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc AUTHORS
Simple merge
diff --cc configure.ac
Simple merge
diff --cc contrib/redhat/collectd.spec
Simple merge
diff --cc src/Makefile.am
Simple merge
collectd, the system statistics collection daemon