From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 20 Dec 2008 09:18:21 +0000 (+0100)
Subject: Merge branch 'collectd-4.5'
X-Git-Tag: collectd-4.6.0~124
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ef7fec0c4e0bbbabb356e6a570ac6297ee06eb80;p=collectd.git

Merge branch 'collectd-4.5'
---

ef7fec0c4e0bbbabb356e6a570ac6297ee06eb80
diff --cc src/rrdtool.c
index 9b236cb8,e1c7902b..32655616
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@@ -873,9 -1217,11 +877,11 @@@ static int rrd_config (const char *key
  		{
  			fprintf (stderr, "rrdtool: `RRARows' must "
  					"be greater than 0.\n");
+ 			ERROR ("rrdtool: `RRARows' must "
+ 					"be greater than 0.\n");
  			return (1);
  		}
 -		rrarows = tmp;
 +		rrdcreate_config.rrarows = tmp;
  	}
  	else if (strcasecmp ("RRATimespan", key) == 0)
  	{
@@@ -922,9 -1269,11 +929,11 @@@
  		{
  			fprintf (stderr, "rrdtool: `XFF' must "
  					"be in the range 0 to 1 (exclusive).");
+ 			ERROR ("rrdtool: `XFF' must "
+ 					"be in the range 0 to 1 (exclusive).");
  			return (1);
  		}
 -		xff = tmp;
 +		rrdcreate_config.xff = tmp;
  	}
  	else if (strcasecmp ("WritesPerSecond", key) == 0)
  	{