![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Tue, 26 Jul 2016 05:56:09 +0000 (07:56 +0200) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Tue, 26 Jul 2016 05:56:09 +0000 (07:56 +0200) |
| 1 | 2 | |||
|---|---|---|---|---|
| src/libcollectdclient/network_buffer.c | patch | | diff1 | | diff2 | | blob | history |
| src/network.c | patch | | diff1 | | diff2 | | blob | history |
| version-gen.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc src/libcollectdclient/network_buffer.c
Simple merge
diff --cc src/network.c
Simple merge
diff --cc version-gen.sh
index d7c6a7655e28fd5e311a08a2911ddd4ddb1a773a,f0f8dcaf91535608b281b69b8a5f398e52326899..70b8c26609f7e8aeafe3e2cc76f00796ea238de7
--- 1/version-gen.sh
--- 2/version-gen.sh
+++ b/version-gen.sh
#!/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"