From: Ruben Kerkhof Date: Mon, 6 Jun 2016 08:32:59 +0000 (+0200) Subject: Merge pull request #1750 from tokkee/sh/cli X-Git-Tag: collectd-5.6.0~227 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3ca6fecf93f7c0cf32f38e02f66ce238dbf96b6;p=thirdparty%2Fcollectd.git Merge pull request #1750 from tokkee/sh/cli daemon: Let all command line options override global options from the config. --- d3ca6fecf93f7c0cf32f38e02f66ce238dbf96b6