From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 8 Sep 2014 09:41:25 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/691'
X-Git-Tag: collectd-5.5.0~204^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4e5c84e8251b25b11b5df7ef3b66259436bdea69;p=collectd.git

Merge remote-tracking branch 'origin/pr/691'
---

4e5c84e8251b25b11b5df7ef3b66259436bdea69
diff --cc src/configfile.c
index 9a5807ce,2eaaad1a..9841efda
--- a/src/configfile.c
+++ b/src/configfile.c
@@@ -117,9 -117,9 +117,10 @@@ static cf_global_option_t cf_global_opt
  	{"WriteQueueLimitLow", NULL, NULL},
  	{"Timeout",     NULL, "2"},
  	{"AutoLoadPlugin", NULL, "false"},
+ 	{"CollectInternalStats", NULL, "false"},
  	{"PreCacheChain",  NULL, "PreCache"},
 -	{"PostCacheChain", NULL, "PostCache"}
 +	{"PostCacheChain", NULL, "PostCache"},
 +	{"MaxReadInterval", NULL, "86400"}
  };
  static int cf_global_options_num = STATIC_ARRAY_SIZE (cf_global_options);