]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
Merge tag 'collectd-5.9.2' 3299/head
authorMatthias Runge <mrunge@redhat.com>
Wed, 9 Oct 2019 12:41:47 +0000 (14:41 +0200)
committerMatthias Runge <mrunge@redhat.com>
Fri, 11 Oct 2019 07:13:22 +0000 (09:13 +0200)
1  2 
src/utils/common/common.c
version-gen.sh

Simple merge
diff --cc version-gen.sh
index 048b5a21858a54a4d366fd227784c130cd6c690b,0298a4437efddac8dda1404a6433dc025e128649..76bd065a10785e46e6f70a020f264ebf8d47daae
@@@ -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'`"