From: Florian Forster <octo@collectd.org>
Date: Tue, 26 Jul 2016 05:56:09 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~151
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=21ab7512825cf8177d5eee5101344b45d0854610

Merge branch 'collectd-5.5'
---

21ab7512825cf8177d5eee5101344b45d0854610
diff --cc version-gen.sh
index d7c6a765,f0f8dcaf..70b8c266
--- a/version-gen.sh
+++ b/version-gen.sh
@@@ -1,10 -1,8 +1,10 @@@
  #!/bin/sh
  
- DEFAULT_VERSION="5.5.1.git"
+ DEFAULT_VERSION="5.5.2.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"