From: Florian Forster <octo@collectd.org>
Date: Sat, 28 Jan 2012 11:03:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'tokkee/sh/collectd-5.0' into collectd-5.0
X-Git-Tag: collectd-5.0.3~5
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=a24bf968e72f9a103a354dcc833619a40849cfcd;hp=-c;p=collectd.git

Merge remote-tracking branch 'tokkee/sh/collectd-5.0' into collectd-5.0
---

a24bf968e72f9a103a354dcc833619a40849cfcd
diff --combined src/collectd.conf.in
index f514f4a7,f1b6bfd3..cd65fd27
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -108,18 -108,14 +108,18 @@@
  #@BUILD_PLUGIN_ONEWIRE_TRUE@LoadPlugin onewire
  #@BUILD_PLUGIN_OPENVPN_TRUE@LoadPlugin openvpn
  #@BUILD_PLUGIN_ORACLE_TRUE@LoadPlugin oracle
 -#@BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl
 +#@BUILD_PLUGIN_PERL_TRUE@<LoadPlugin perl>
 +#@BUILD_PLUGIN_PERL_TRUE@  Globals true
 +#@BUILD_PLUGIN_PERL_TRUE@</LoadPlugin>
  #@BUILD_PLUGIN_PINBA_TRUE@LoadPlugin pinba
  #@BUILD_PLUGIN_PING_TRUE@LoadPlugin ping
  #@BUILD_PLUGIN_POSTGRESQL_TRUE@LoadPlugin postgresql
  #@BUILD_PLUGIN_POWERDNS_TRUE@LoadPlugin powerdns
  #@BUILD_PLUGIN_PROCESSES_TRUE@LoadPlugin processes
  #@BUILD_PLUGIN_PROTOCOLS_TRUE@LoadPlugin protocols
 -#@BUILD_PLUGIN_PYTHON_TRUE@LoadPlugin python
 +#@BUILD_PLUGIN_PYTHON_TRUE@<LoadPlugin python>
 +#@BUILD_PLUGIN_PYTHON_TRUE@  Globals true
 +#@BUILD_PLUGIN_PYTHON_TRUE@</LoadPlugin>
  #@BUILD_PLUGIN_REDIS_TRUE@LoadPlugin redis
  #@BUILD_PLUGIN_ROUTEROS_TRUE@LoadPlugin routeros
  #@BUILD_PLUGIN_RRDCACHED_TRUE@LoadPlugin rrdcached
@@@ -988,6 -984,7 +988,7 @@@
  #@BUILD_PLUGIN_TARGET_REPLACE_TRUE@LoadPlugin target_replace
  #@BUILD_PLUGIN_TARGET_SCALE_TRUE@LoadPlugin target_scale
  #@BUILD_PLUGIN_TARGET_SET_TRUE@LoadPlugin target_set
+ #@BUILD_PLUGIN_TARGET_V5UPGRADE_TRUE@LoadPlugin target_v5upgrade
  
  #----------------------------------------------------------------------------#
  # The following block demonstrates the default behavior if no filtering is   #