From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 14 Apr 2015 07:27:00 +0000 (+0200)
Subject: Merge branch 'collectd-5.4'
X-Git-Tag: collectd-5.5.0~38
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=eea01a8f212634414a21462ba79dc058dc5fb304;hp=-c

Merge branch 'collectd-5.4'

Conflicts:
	src/Makefile.am
	src/network.c
---

eea01a8f212634414a21462ba79dc058dc5fb304
diff --combined version-gen.sh
index e2519508,7bd07cbc..7b573ab7
--- a/version-gen.sh
+++ b/version-gen.sh
@@@ -1,8 -1,8 +1,8 @@@
- #!/usr/bin/env bash
+ #!/bin/sh
  
  DEFAULT_VERSION="5.4.2.git"
  
 -VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
 +VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`"
  
  if test -z "$VERSION"; then
  	VERSION="$DEFAULT_VERSION"