From: Andrew Bays <andrew.bays@gmail.com>
Date: Mon, 2 Jul 2018 10:41:44 +0000 (-0400)
Subject: Merge branch 'master' into connectivity
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=2e48020912c1fa5c5e01421c039f967116547277

Merge branch 'master' into connectivity
---

2e48020912c1fa5c5e01421c039f967116547277
diff --cc AUTHORS
index 9fcb386d,409655ac..bf785f69
--- a/AUTHORS
+++ b/AUTHORS
@@@ -62,9 -59,9 +62,12 @@@ Andrew Bays <abays at redhat.com
  Andy Parkins <andyp at fussylogic.co.uk>
   - battery plugin: sysfs code.
  
 +Aneesh Puttur <aputtur at redhat.com>
 + - connectivity plugin.
 +
+ Andy Smith <ansmith at redhat.com>
+  - AMQP 1.0 plugin.
+ 
  Anthony Dewhurst <dewhurst at gmail.com>
   - zfs_arc plugin.
  
diff --cc src/types.db
index 01bb3539,f4933ee3..3f8b5818
--- a/src/types.db
+++ b/src/types.db
@@@ -31,8 -31,8 +31,9 @@@ clock_state             value:GAUGE:0:
  clock_stratum           value:GAUGE:0:U
  compression             uncompressed:DERIVE:0:U, compressed:DERIVE:0:U
  compression_ratio       value:GAUGE:0:2
+ commands                value:DERIVE:0:U
  connections             value:DERIVE:0:U
 +connectivity            value:GAUGE:0:2
  conntrack               value:GAUGE:0:4294967295
  contextswitch           value:DERIVE:0:U
  cookies                 value:DERIVE:0:U