From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 24 Feb 2015 09:02:58 +0000 (+0100)
Subject: Merge branch 'collectd-5.4'
X-Git-Tag: collectd-5.5.0~82
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=dd8429c16bc57f949abb2537e003b76ad88b6f90

Merge branch 'collectd-5.4'

Conflicts:
	src/Makefile.am
	src/write_http.c
---

dd8429c16bc57f949abb2537e003b76ad88b6f90
diff --cc contrib/redhat/collectd.spec
index 5c7803f4,c6f7a061..406ea48b
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -2159,14 -1944,8 +2157,13 @@@ f
  %{_libdir}/%{name}/nut.so
  %endif
  
 +%if %{with_openldap}
 +%files openldap
 +%{_libdir}/%{name}/openldap.so
 +%endif
 +
  %if %{with_perl}
  %files perl
- %doc perl-examples/*
  %{perl_vendorlib}/Collectd.pm
  %{perl_vendorlib}/Collectd/
  %{_mandir}/man3/Collectd::Unixsock.3pm*
diff --cc src/collectd.conf.pod
index 356c6f5a,3c599ebd..2ee22197
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -3150,12 -2800,8 +3150,12 @@@ privileges. See the B<User> documentati
  =item B<SlaveNotifications> I<true|false>
  
  If enabled, the plugin sends a notification if the replication slave I/O and /
- or SQL threads are not running.
+ or SQL threads are not running. Defaults to B<false>.
  
 +=item B<ConnectTimeout> I<Seconds>
 +
 +Sets the connect timeout for the MySQL client.
 +
  =back
  
  =head2 Plugin C<netapp>