From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 1 Oct 2009 19:34:21 +0000 (+0200)
Subject: Merge branch 'collectd-4.8'
X-Git-Tag: collectd-4.9.0~68
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7936f094388707ee066b2e9f3fc75659e1715181;p=collectd.git

Merge branch 'collectd-4.8'

Conflicts:
	src/types.db
---

7936f094388707ee066b2e9f3fc75659e1715181
diff --cc src/types.db
index c6526d42,8ac9dd4f..960674c0
--- a/src/types.db
+++ b/src/types.db
@@@ -125,8 -121,7 +125,8 @@@ ps_stacksize		value:GAUGE:0:92233720368
  ps_state		value:GAUGE:0:65535
  ps_vm			value:GAUGE:0:9223372036854775807
  queue_length		value:GAUGE:0:U
- records                 count:GAUGE:0:U
 +response_time		value:GAUGE:0:U
+ records			count:GAUGE:0:U
  route_etx		value:GAUGE:0:U
  route_metric		value:GAUGE:0:U
  routes			value:GAUGE:0:U