From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 2 Oct 2009 07:54:14 +0000 (+0200)
Subject: Merge branch 'collectd-4.8'
X-Git-Tag: collectd-4.9.0~61
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=a497509bc0a06065759a6d4e43497b75a2c9ecb8

Merge branch 'collectd-4.8'

Conflicts:
	src/df.c
---

a497509bc0a06065759a6d4e43497b75a2c9ecb8
diff --cc src/df.c
index 54f70ef9,462e1c67..0cc782ad
--- a/src/df.c
+++ b/src/df.c
@@@ -137,7 -136,7 +137,7 @@@ static void df_submit (char *df_name
  	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
  	sstrncpy (vl.plugin, "df", sizeof (vl.plugin));
  	sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));
- 	sstrncpy (vl.type, type, sizeof (vl.host));
 -	sstrncpy (vl.type, "df", sizeof (vl.type));
++	sstrncpy (vl.type, type, sizeof (vl.type));
  	sstrncpy (vl.type_instance, df_name, sizeof (vl.type_instance));
  
  	plugin_dispatch_values (&vl);