summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2bb6e93)
raw | patch | inline | side by side (parent: 2bb6e93)
author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Sat, 29 Mar 2008 09:34:46 +0000 (10:34 +0100) | ||
committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
Sat, 29 Mar 2008 09:34:46 +0000 (10:34 +0100) |
ChangeLog | patch | blob | history | |
version-gen.sh | patch | blob | history |
diff --git a/ChangeLog b/ChangeLog
index 899c2aca59acd5f785b63fce8b88c456ca03caa9..6f10fac65f445632ecc137f438595ca4e510a6f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
-2008-mm-dd, Version 4.2.6
+2008-03-29, Version 4.2.6
* collectd: Improved error messages when parsing the configuration.
* sensors plugin: Fix temperature collection with libsensors4.
* unixsock plugin: Fix mixed input and output operation on streams.
diff --git a/version-gen.sh b/version-gen.sh
index 4275ffd1357e6d148c8c4f7b1740ec09f85efc0f..61763ac5e3d04fbe6e36e8a6d5f98fdfdb48ae4d 100755 (executable)
--- a/version-gen.sh
+++ b/version-gen.sh
#!/bin/sh
-DEFAULT_VERSION="4.2.5.git"
+DEFAULT_VERSION="4.2.6.git"
VERSION="$( git describe 2> /dev/null | sed -e 's/^collectd-//' )"