Merge branch 'ps/http'

[collectd.git] / AUTHORS

diff --git a/AUTHORS b/AUTHORS
index 2ef40e1..f86d6d3 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -51,6 +51,7 @@ Doug MacEachern <dougm at hyperic.com>
  - OpenVPN plugin.
  - jcollectd (two-way JMX integration).
  - A few other patches to various plugins.
+ - curl_json plugin.
 
 Edward “Koko” Konetzko <konetzed at quixoticagony.com>
  - fscache plugin.
@@ -78,6 +79,10 @@ Luke Herberling <collectd at c-ware.com>
 Lyonel Vincent <lyonel at ezix.org>
  - processes plugin.
 
+Marco Chiappero <marco at absence.it>
+ - uptime plugin.
+ - ip6tables support in the iptables plugin.
+
 Michael Stapelberg <michael+git at stapelberg.de>
  - OpenBSD port of the tcpconns plugin.
 
@@ -99,6 +104,14 @@ Oleg King <king2 at kaluga.ru>
    + the disk plugin, and
    + the users plugin.
 
+Ondrej Zajicek <santiago at crfreenet.org>
+ - madwifi plugin.
+
+Paul Sadauskas <psadauskas at gmail.com>
+ - tokyotyrant plugin.
+ - `ReportByDevice' option of the df plugin.
+ - write_http plugin.
+
 Peter Holik <peter at holik.at>
  - cpufreq plugin.
  - multimeter plugin.
@@ -116,6 +129,9 @@ Richard W. M. Jones <rjones at redhat.com>
 Roman Klesel <roman.klesel at noris.de>
  - Oracle schema and sample SQL statements to be used with the Oracle plugin.
 
+Rodolphe Quiédeville <rquiedeville at bearstech.com>
+ - Lock statistics in the mysql plugin.
+
 Scott Garrett <sgarrett at technomancer.com>
  - tape plugin.