From: Matthias Runge <mrunge@redhat.com>
Date: Wed, 9 Oct 2019 12:41:47 +0000 (+0200)
Subject: Merge tag 'collectd-5.9.2'
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=a503c54a95d139f117650a0e6d80e6edfe81e8bf

Merge tag 'collectd-5.9.2'
---

a503c54a95d139f117650a0e6d80e6edfe81e8bf
diff --cc version-gen.sh
index 048b5a21,0298a443..76bd065a
--- a/version-gen.sh
+++ b/version-gen.sh
@@@ -1,6 -1,6 +1,6 @@@
  #!/bin/sh
  
- DEFAULT_VERSION="5.8.1.git"
 -DEFAULT_VERSION="5.9.0.git"
++DEFAULT_VERSION="5.9.2.git"
  
  if [ -d .git ]; then
  	VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`"