Merge branch 'collectd-5.5'

diff --cc contrib/redhat/collectd.spec
Simple merge

diff --cc src/collectd.conf.pod
index fde3493,0eabec7..6a94edc
--- 1/src/collectd.conf.pod
--- 2/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -4483,23 -4305,20 +4483,35 @@@ Default: C<Collectd notify: %s@%s
  
  =back
  
 +=head2 Plugin C<notify_nagios>
 +
 +The I<notify_nagios> plugin writes notifications to Nagios' I<command file> as
 +a I<passive service check result>.
 +
 +Available configuration options:
 +
 +=over 4
 +
 +=item B<CommandFile> I<Path>
 +
 +Sets the I<command file> to write to. Defaults to F</usr/local/nagios/var/rw/nagios.cmd>.
 +
 +=back
 +
  =head2 Plugin C<ntpd>
  
+ The C<ntpd> plugin collects per-peer ntpd data such as time offset and time
+ dispersion.
+ 
+ For talking to B<ntpd>, it mimics what the B<ntpdc> control program does on
+ wire - using B<mode 7> specific requests. This mode is deprecated with
+ newer B<ntpd> releases (4.2.7p230 and later). For the C<ntpd> plugin to work
+ correctly with them, the ntp daemon must be explicitly configured to
+ enable B<mode 7> (which is disabled by default). Refer to the I<ntp.conf(5)>
+ manual page for details.
+ 
+ Available configuration options for the C<ntpd> plugin:
+ 
  =over 4
  
  =item B<Host> I<Hostname>

diff --cc src/daemon/plugin.c
Simple merge

diff --cc src/daemon/utils_ignorelist.c
Simple merge

diff --cc src/processes.c
Simple merge

diff --cc src/write_sensu.c
Simple merge

diff --cc version-gen.sh
index 493a6eb,e0ad124..d7c6a76
--- 1/version-gen.sh
--- 2/version-gen.sh
+++ b/version-gen.sh
@@@ -1,10 -1,8 +1,10 @@@
  #!/bin/sh
  
- DEFAULT_VERSION="5.5.0.git"
+ DEFAULT_VERSION="5.5.1.git"
  
 -VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`"
 +if [ -d .git ]; then
 +      VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`"
 +fi
  
  if test -z "$VERSION"; then
        VERSION="$DEFAULT_VERSION"