projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8a92d10 2f0642a)
Merge pull request #22 from bostjan/master
authorFlorian Forster <github@nospam.verplant.org>
Sat, 25 Feb 2012 15:04:41 +0000 (07:04 -0800)
committerFlorian Forster <github@nospam.verplant.org>
Sat, 25 Feb 2012 15:04:41 +0000 (07:04 -0800)
php-collection: Fixed DS definitions for apache_bytes, apache_requests and apache_scoreboard merge


Trivial merge
collectd, the system statistics collection daemon