From: Florian Forster <octo@collectd.org>
Date: Thu, 23 Apr 2020 19:37:56 +0000 (+0200)
Subject: Merge pull request #3438 from collectd/collectd-5.10
X-Git-Tag: collectd-5.12.0~6^2^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a34214d8697d8e3e5c87929e421365796b158339;p=thirdparty%2Fcollectd.git

Merge pull request #3438 from collectd/collectd-5.10

Merge 5.10 into 5.11
---

a34214d8697d8e3e5c87929e421365796b158339
diff --cc AUTHORS
index c1fa48d6e,a050e7241..61a15f7a8
--- a/AUTHORS
+++ b/AUTHORS
@@@ -72,12 -65,9 +72,9 @@@ 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.
 - 
 +
  Aneesh Puttur <aputtur at redhat.com>
   - connectivity plugin.