Merge remote-tracking branch 'origin/collectd-5.10' into collectd-5.11

diff --cc .travis.yml
Simple merge

diff --cc contrib/redhat/collectd.spec
index 864ef1b3068de12d370606233352a12d97aabcf1,885ba5c204c116aa4420aec836aedad7d93862d9..50fd992464a28eb692e36898023b6deecbd9c1ab
--- 1/contrib/redhat/collectd.spec
--- 2/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -2904,9 -2944,9 +2919,12 @@@ f
  %doc contrib/
  
  %changelog
+ * Fri Oct 18 2019 Matthias Runge <mrunge@redhat.com> - 5.10.0-1
+ - update to 5.10.0
+ 
 +* Mon Oct 14 2019 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.9.2-2
 +- Remove lvm plugin, liblvmapp has been deprecated upstream
 +
  * Fri Jun 14 2019 Fabien Wernli <rpmbuild@faxmodem.org> - 5.9.0-1
  - add code for write_stackdriver (disabled for now)
  - add code for gpu_nvidia (disabled for now)

diff --cc src/collectd.conf.pod
Simple merge

diff --cc version-gen.sh
index 962eddc866043fe78a2afc25e3f4a47e91e02eef,24cf667d6490119ad660439666d188f1d3969bc8..4599ed80a1bbe07db7d98701102a070e50a86bb9
--- 1/version-gen.sh
--- 2/version-gen.sh
+++ b/version-gen.sh
@@@ -1,9 -1,9 +1,9 @@@
  #!/bin/sh
  
- DEFAULT_VERSION="5.9.2.git"
+ DEFAULT_VERSION="5.10.0.git"
  
  if [ -d .git ]; then
 -      VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`"
 +      VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | sed -e '/^collectd-/!d' -e 's///' -e 'y/-/./'`"
  fi
  
  if test -z "$VERSION"; then