projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ecf283d 508981f)
Merge pull request #1750 from tokkee/sh/cli
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 6 Jun 2016 08:32:59 +0000 (10:32 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 6 Jun 2016 08:32:59 +0000 (10:32 +0200)
daemon: Let all command line options override global options from the config.


Trivial merge
collectd, the system statistics collection daemon