Merge remote-tracking branch 'github/master'

[collectd.git] / AUTHORS

diff --git a/AUTHORS b/AUTHORS
index 1d0711ce5d8a281f645af63f71c094a6499a2b32..11b0475bdfbaf4962affa96423c3675c1cb758d4 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -28,6 +28,9 @@ Amit Gupta <amit.gupta221 at gmail.com>
  - Multiple servers in the apache plugin.
  - curl_xml plugin.
 
+Andreas Henriksson <andreas at fatal.se>
+ - libmnl support in the netlink plugin.
+
 Anthony Dewhurst <dewhurst at gmail.com>
  - zfs_arc plugin.
 
@@ -128,6 +131,11 @@ Manuel Sanmartin
    + swap
  - Various AIX-related fixes and hacks.
 
+Marc Fournier <marc.fournier at camptocamp.com>
+ - Various fixes to the varnish plugin.
+ - RPM specfile update.
+ - libmnl support in the netlink plugin.
+
 Marco Chiappero <marco at absence.it>
  - uptime plugin.
  - ip6tables support in the iptables plugin.