From: octo <octo>
Date: Tue, 21 Mar 2006 13:26:41 +0000 (+0000)
Subject: svn merge -r523:547 branches/config-step trunk
X-Git-Tag: liboping-0.1.0~143
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c87194194948fec81eb7ead8b7d9615efc7778e1;p=collectd.git

svn merge -r523:547 branches/config-step trunk
---

c87194194948fec81eb7ead8b7d9615efc7778e1
diff --cc src/wireless.c
index d41195e7,03d124b2..f0b9b01a
--- a/src/wireless.c
+++ b/src/wireless.c
@@@ -39,9 -41,9 +39,9 @@@ static char *filename_template = "wirel
  
  static char *ds_def[] =
  {
- 	"DS:quality:GAUGE:25:0:U",
- 	"DS:power:GAUGE:25:U:0",
- 	"DS:noise:GAUGE:25:U:0",
+ 	"DS:quality:GAUGE:"COLLECTD_HEARTBEAT":0:U",
 -	"DS:power:GAUGE:"COLLECTD_HEARTBEAT":0:U",
 -	"DS:noise:GAUGE:"COLLECTD_HEARTBEAT":0:U",
++	"DS:power:GAUGE:"COLLECTD_HEARTBEAT":U:0",
++	"DS:noise:GAUGE:"COLLECTD_HEARTBEAT":U:0",
  	NULL
  };
  static int ds_num = 3;