From: Dagobert Michelsen <dam@opencsw.org>
Date: Tue, 25 Feb 2020 10:07:46 +0000 (+0100)
Subject: Merge branch 'master' into master
X-Git-Tag: collectd-5.11.0~34^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2939618b9a1ab93374fddbff855b9b161f3d7d7b;p=thirdparty%2Fcollectd.git

Merge branch 'master' into master
---

2939618b9a1ab93374fddbff855b9b161f3d7d7b
diff --cc src/types.db
index 82b284d46,aa1ebf803..17d7de242
--- a/src/types.db
+++ b/src/types.db
@@@ -135,7 -139,7 +140,8 @@@ job_stats               value:DERIVE:0:
  latency                 value:GAUGE:0:U
  links                   value:GAUGE:0:U
  load                    shortterm:GAUGE:0:5000, midterm:GAUGE:0:5000, longterm:GAUGE:0:5000
 +max_ec                  value:COUNTER:0:U
+ media                   value:GAUGE:0:18446744073709551615
  memory_bandwidth        value:DERIVE:0:U
  md_disks                value:GAUGE:0:U
  memcached_command       value:DERIVE:0:U