Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

	ChangeLog
	version-gen.sh

diff --git a/ChangeLog b/ChangeLog
index fceab49..4f33a94 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,12 @@
          physical server. Thanks to Richard Jones from Red Hat's Emerging
          Technology group for this plugin.
 
+2008-03-29, Version 4.2.6
+       * collectd: Improved error messages when parsing the configuration.
+       * sensors plugin: Fix temperature collection with libsensors4.
+       * unixsock plugin: Fix mixed input and output operation on streams.
+       * wireless plugin: Fix reading noise value.
+
 2008-03-04, Version 4.2.5
        * apache plugin: Improved initialization and error messages.
        * exec plugin: Set supplementary group IDs.

diff --git a/src/sensors.c b/src/sensors.c
index a96e04c..2a0a9ea 100644 (file)
--- a/src/sensors.c
+++ b/src/sensors.c
@@ -580,7 +580,7 @@ static int sensors_read (void)
                        type = "fanspeed";
                else if (fl->feature->type
                                == SENSORS_FEATURE_TEMP)
-                       type = "input";
+                       type = "temperature";
                else
                        continue;