From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Sun, 8 Nov 2015 16:14:54 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21a4ddcc2d66eea59224fd95746c7533b1b1a46d;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-5.4' into collectd-5.5
---

21a4ddcc2d66eea59224fd95746c7533b1b1a46d
diff --cc src/daemon/plugin.c
index 3da8eccbb,6d3d3c952..e7d4e8df2
--- a/src/daemon/plugin.c
+++ b/src/daemon/plugin.c
@@@ -1650,9 -1536,8 +1648,11 @@@ void plugin_init_all (void
  		le = le->next;
  	}
  
+ 	start_write_threads ((size_t) write_threads_num);
+ 
 +	max_read_interval = global_option_get_time ("MaxReadInterval",
 +			DEFAULT_MAX_READ_INTERVAL);
 +
  	/* Start read-threads */
  	if (read_heap != NULL)
  	{