projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8aad55a 4c3b7ef)
Merge pull request #829 from njh/cpu_state
authorPierre-Yves Ritschard <pyr@spootnik.org>
Mon, 1 Dec 2014 07:45:37 +0000 (08:45 +0100)
committerPierre-Yves Ritschard <pyr@spootnik.org>
Mon, 1 Dec 2014 07:45:37 +0000 (08:45 +0100)
Renamed all CPU_STATE_* defines for consistency and to avoid conflicts


Trivial merge
collectd, the system statistics collection daemon