From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 13 Mar 2020 15:20:33 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/collectd-5.10' into collectd-5.11
X-Git-Tag: collectd-5.11.0~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25aab3b38f917f9d45f2cbbaf529f5626166cf6a;p=thirdparty%2Fcollectd.git

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

25aab3b38f917f9d45f2cbbaf529f5626166cf6a
diff --cc contrib/redhat/collectd.spec
index 864ef1b30,885ba5c20..50fd99246
--- a/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 version-gen.sh
index 962eddc86,24cf667d6..4599ed80a
--- a/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