projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc8def2 bc5073c)
Merge branch 'collectd-5.5' into collectd-5.6
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 16 Aug 2016 13:00:59 +0000 (15:00 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 16 Aug 2016 13:00:59 +0000 (15:00 +0200)
1  2 
contrib/redhat/collectd.spec patch | diff1 | diff2 | blob | history

diff --cc contrib/redhat/collectd.spec
Simple merge
collectd, the system statistics collection daemon