Merge branch 'collectd-4.9' of verplant.org:/var/lib/git/collectd into collectd-4.9

diff --git a/src/collectd-python.pod b/src/collectd-python.pod
index 9b990b9b322276e2f27e9941d75fc963cced3937..3620aee7f6879958675550c15bd01c37f5538430 100644 (file)
--- a/src/collectd-python.pod
+++ b/src/collectd-python.pod
@@ -86,7 +86,7 @@ collectd script as well as from a normal python interpreter:
 B<1.> collectd will try to import the B<readline> module to give you a decent
 way of entering your commands. The daemonized collectd won't do that.
 
-=item 
+=item
 
 B<2.> collectd will block I<SIGINT>. Pressing I<Ctrl+C> will usually cause
 collectd to shut down. This would be problematic in an interactive session,
@@ -217,17 +217,17 @@ It has no methods beyond the bare minimum and only exists for its data members.
 Data descriptors defined here:
 
 =over 4
- 
+
 =item parent
 
 This represents the parent of this node. On the root node
 of the config tree it will be None.
- 
+
 =item key
 
 This is the keyword of this item, i.e. the first word of any given line in the
 config file. It will always be a string.
- 
+
 =item values
 
 This is a tuple (which might be empty) of all value, i.e. words following the
@@ -235,7 +235,7 @@ keyword in any given line in the config file.
 
 Every item in this tuple will be either a string or a float or a boolean,
 depending on the contents of the configuration file.
- 
+
 =item children
 
 This is a tuple of child nodes. For most nodes this will be empty. If this node
@@ -319,7 +319,7 @@ Methods defined here:
 =over 4
 
 =item B<dispatch>([type][, values][, plugin_instance][, type_instance][, plugin][, host][, time][, interval]) -> None.
-    
+
 Dispatch this instance to the collectd process. The object has members for each
 of the possible arguments for this method. For a detailed explanation of these
 parameters see the member of the same same.
@@ -347,7 +347,7 @@ The interval is the timespan in seconds between two submits for the same data
 source. This value has to be a positive integer, so you can't submit more than
 one value per second. If this member is set to a non-positive value, the
 default value as specified in the config file will be used (default: 10).
-    
+
 If you submit values more often than the specified interval, the average will
 be used. If you submit less values, your graphs will have gaps.
 
@@ -395,11 +395,11 @@ Methods defined here:
 =over 4
 
 =item B<dispatch>([type][, values][, plugin_instance][, type_instance][, plugin][, host][, time][, interval]) -> None.  Dispatch a value list.
-    
+
 Dispatch this instance to the collectd process. The object has members for each
 of the possible arguments for this method. For a detailed explanation of these
 parameters see the member of the same same.
-    
+
 If you do not submit a parameter the value saved in its member will be
 submitted. If you do provide a parameter it will be used instead, without
 altering the member.

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index ad13353f59242ddadceed98393f03fed8cdfa1a7..c9f55cda3a6c5e85b4930d02fb24808e89d835f1 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -255,6 +255,8 @@ FQDNLookup   true
 #      FSType "ext3"
 #      IgnoreSelected false
 #      ReportByDevice false
+#      ReportReserved false
+#      ReportInodes false
 #</Plugin>
 
 #<Plugin disk>

diff --git a/src/curl.c b/src/curl.c
index abf45c23d2c7990077295a0c130c3ecd358bf498..bc11c28afdaf149154e1f2bf83fd333769f4c6c1 100644 (file)
--- a/src/curl.c
+++ b/src/curl.c
@@ -1,6 +1,7 @@
 /**
  * collectd - src/curl.c
  * Copyright (C) 2006-2009  Florian octo Forster
+ * Copyright (C) 2009       Aman Gupta
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -17,6 +18,7 @@
  *
  * Authors:
  *   Florian octo Forster <octo at verplant.org>
+ *   Aman Gupta <aman at tmm1.net>
  **/
 
 #include "collectd.h"

diff --git a/src/df.c b/src/df.c
index 62775fd286df0485c1fd0e23e25142a921e6a4c1..9185ba449560d17d13c1bb9c5a8b92927986d391 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/df.c
- * Copyright (C) 2005-2007  Florian octo Forster
+ * Copyright (C) 2005-2009  Florian octo Forster
  * Copyright (C) 2009       Paul Sadauskas
  *
  * This program is free software; you can redistribute it and/or modify it

diff --git a/src/processes.c b/src/processes.c
index 576a5b1515940d030da301d98001ab8454de7579..8c7700af6fa5670eded43dc82b253db79acdf74a 100644 (file)
--- a/src/processes.c
+++ b/src/processes.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2006-2008  Florian octo Forster
  * Copyright (C) 2008       Oleg King
  * Copyright (C) 2009       Sebastian Harl
+ * Copyright (C) 2009       Andrés J. Díaz
  * Copyright (C) 2009       Manuel Sanmartin
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -25,6 +26,7 @@
  *   Florian octo Forster <octo at verplant.org>
  *   Oleg King <king2 at kaluga.ru>
  *   Sebastian Harl <sh at tokkee.org>
+ *   Andrés J. Díaz <ajdiaz at connectical.com>
  *   Manuel Sanmartin
  **/