From: Florian Forster <octo@collectd.org>
Date: Wed, 21 Sep 2016 06:48:56 +0000 (+0200)
Subject: Merge branch 'pr/1649'
X-Git-Tag: collectd-5.7.0~73
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=e1bfa71aca1f37c2f293dc9adb44065c6e7a9ad9

Merge branch 'pr/1649'
---

e1bfa71aca1f37c2f293dc9adb44065c6e7a9ad9
diff --cc src/types.db
index 4f8d31c7,d89d4116..e3da48a4
--- a/src/types.db
+++ b/src/types.db
@@@ -74,9 -73,8 +74,10 @@@ duration                seconds:GAUGE:0
  email_check             value:GAUGE:0:U
  email_count             value:GAUGE:0:U
  email_size              value:GAUGE:0:U
 +energy                  value:GAUGE:U:U
 +energy_wh               value:GAUGE:U:U
  entropy                 value:GAUGE:0:4294967295
+ errors                  value:DERIVE:0:U
  evicted_keys            value:DERIVE:0:U
  expired_keys            value:DERIVE:0:U
  fanspeed                value:GAUGE:0:U