From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Wed, 8 Apr 2015 23:14:40 +0000 (+0200)
Subject: Merge branch 'collectd-5.4'
X-Git-Tag: collectd-5.5.0~44
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=9e5cdde4656070893ecf59c6234af0593bdda1a0

Merge branch 'collectd-5.4'
---

9e5cdde4656070893ecf59c6234af0593bdda1a0
diff --cc src/collectd.conf.in
index 089e7818,04d1ab33..d31ef157
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -152,12 -135,9 +152,10 @@@
  #@BUILD_PLUGIN_NUT_TRUE@LoadPlugin nut
  #@BUILD_PLUGIN_OLSRD_TRUE@LoadPlugin olsrd
  #@BUILD_PLUGIN_ONEWIRE_TRUE@LoadPlugin onewire
 +#@BUILD_PLUGIN_OPENLDAP_TRUE@LoadPlugin openldap
  #@BUILD_PLUGIN_OPENVPN_TRUE@LoadPlugin openvpn
  #@BUILD_PLUGIN_ORACLE_TRUE@LoadPlugin oracle
- #@BUILD_PLUGIN_PERL_TRUE@<LoadPlugin perl>
- #@BUILD_PLUGIN_PERL_TRUE@  Globals true
- #@BUILD_PLUGIN_PERL_TRUE@</LoadPlugin>
+ #@BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl
  #@BUILD_PLUGIN_PINBA_TRUE@LoadPlugin pinba
  #@BUILD_PLUGIN_PING_TRUE@LoadPlugin ping
  #@BUILD_PLUGIN_POSTGRESQL_TRUE@LoadPlugin postgresql