projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0cb9bbb 422a90c)
Merge branch 'mlsr/unixsock_getthreshold' of https://github.com/manuelluis/collectd
authorPierre-Yves Ritschard <pyr@spootnik.org>
Sat, 26 Jul 2014 07:00:23 +0000 (09:00 +0200)
committerPierre-Yves Ritschard <pyr@spootnik.org>
Sat, 26 Jul 2014 07:00:23 +0000 (09:00 +0200)

Trivial merge
collectd, the system statistics collection daemon