source/collectd
1
0
Fork 0
mirror of https://github.com/collectd/collectd.git synced 2026-02-09 04:09:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,016 Commits 22 Branches 167 Tags
main
Commit Graph

104 Commits

Author SHA1 Message Date
Florian Forster
8a106a12be version-gen.sh: Add the --tags flag to git describe. 2024-02-07 09:22:45 +01:00
Kamil Wiatrowski
2bda932fb5 Update changelog and version number for release 5.12. 
Signed-off-by: Kamil Wiatrowski <kamilx.wiatrowski@intel.com>
 2020-09-03 10:34:55 +01:00
Matthias Runge
78ee11ce28 Prepare collectd-5.11 release 2020-03-16 15:18:24 +01:00
Ruben Kerkhof
25aab3b38f Merge remote-tracking branch 'origin/collectd-5.10' into collectd-5.11 2020-03-13 16:20:33 +01:00
Dagobert Michelsen
938e9d743b Merge pull request #2635 from wrp/grep 
Cleanup version-gen.sh
 2020-02-27 22:05:50 +01:00
Matthias Runge
305eb7279f Prepare 5.10 release 2019-10-17 14:20:12 +02:00
Matthias Runge
a503c54a95 Merge tag 'collectd-5.9.2' 2019-10-11 09:13:22 +02:00
Florian Forster
76e2f5c182 Bump version to 5.9.0; Update ChangeLog. 2019-06-13 11:33:05 +02:00
Florian Forster
ca1cb27150 Bump version to 5.8.1; Update ChangeLog. 2018-10-22 13:20:48 +02:00
William Pursell
50dd5baeeb Cleanup version-gen.sh 
Existing script matches too generously.  eg, an annotated
tag 'foo-connectd-bar' will not be filtered.  Effectively,
this commit replaces 'grep collectd' with 'grep ^collectd-',
but removes the grep and does the filtering directly in sed.
 2017-12-28 10:59:55 -08:00
Florian Forster
c84222bb64 Update version to 5.8.0. 2017-11-18 09:59:39 +01:00
Florian Forster
5fbface076 Update changelog, bump version to 5.8.0-RC0. 2017-11-04 21:36:01 +01:00
Florian Forster
4418639354 Bump version to 5.7.2; Update ChangeLog. 2017-06-06 20:11:05 +02:00
Florian Forster
0c157068b3 Bump version to 5.7.1; Update ChangeLog. 2017-01-23 08:42:35 +01:00
Florian Forster
82f94c7cd5 Bump version to 5.7.0; Update ChangeLog. 2016-12-12 08:57:37 +01:00
Florian Forster
41bff0a406 Bump version to 5.6.1; Update ChangeLog. 2016-11-30 09:44:51 +01:00
Florian Forster
1f94db271d Bump version to 5.6.1; Update ChangeLog. 2016-10-07 15:52:41 +02:00
Florian Forster
7e3059ba3d Bump version to 5.6.0; Update ChangeLog. 2016-09-11 10:01:10 +02:00
Florian Forster
21ab751282 Merge branch 'collectd-5.5' 2016-07-26 07:56:09 +02:00
Florian Forster
0e60b30b93 Bump version to 5.5.2; Update ChangeLog. 2016-07-25 13:52:23 +02:00
Marc Fournier
00f9279d97 Merge branch 'collectd-5.5' 2016-02-09 23:27:29 +01:00
Florian Forster
6d3d76ed0f Bump version to 5.5.1; Update ChangeLog. 2016-01-22 09:56:43 +01:00
Ruben Kerkhof
d353e84321 Only run git describe when we're in a git repo 
This fixes an issue I see when extracting a collectd
tarball into another git repo (the Fedora collectd rpm one).
In that case version-gen.sh picked up the last tag from the Fedora
repo, which is the wrong one.
 2015-11-28 13:23:34 +01:00
Ruben Kerkhof
08ef2c2cca Use a single sed invocation 2015-08-14 20:51:15 +02:00
Ruben Kerkhof
63da831bc8 Always use 7 hex characters when describing 
Some users (like me) override this in their .gitconfig
 2015-08-14 20:50:33 +02:00
Ruben Kerkhof
bcce965ce1 when building from dirty working dir, show it. 
This adds a + when the working dir is dirty, i.e.:
5.5.0.355.gfba3b8da7b64+
 2015-08-14 20:49:41 +02:00
Florian Forster
cf9cb3367b Bump version to 5.5.0; Update ChangeLog. 2015-05-20 22:14:46 +02:00
Ruben Kerkhof
b2086f25ed /bin/sh on OSX doesn't understand -n 
This breaks PACKAGEVERSION since the -n is left verbatim in the string.
Use the more portable printf instead
 2015-05-09 20:34:52 +02:00
Marc Fournier
eea01a8f21 Merge branch 'collectd-5.4' 
Conflicts:
	src/Makefile.am
	src/network.c
 2015-04-14 09:27:00 +02:00
Marc Fournier
e9ef1a2f33 Merge branch 'collectd-5.3' into collectd-5.4 2015-04-14 00:24:46 +02:00
Marc Fournier
8df7333d67 Revert "version-gen.sh: Switch to bash due to bashisms." 
The last bashism was removed in 4d376681. Reverting to /bin/sh prevents
build errors on platforms without bash installed by default.

This reverts commit 3bda88e8b4.
 2015-04-14 00:21:57 +02:00
Marc Fournier
9817e7298b Merge branch 'collectd-5.4' 
Conflicts:
	configure.ac
	src/dbi.c
	src/utils_latency.c
 2015-03-12 10:07:27 +01:00
Florian Forster
7f3cfaf93d Bump version to 5.4.2; Update ChangeLog. 2015-02-26 15:06:36 +01:00
Florian Forster
103f05e098 Merge branch 'collectd-5.4' 
Conflicts:
	configure.ac
	src/curl_json.c
	src/lvm.c
	src/write_riemann.c
 2014-08-18 09:50:34 +02:00
Florian Forster
c517ec54a7 Bump version to 5.4.1; Update ChangeLog. 2014-01-26 09:03:43 +01:00
Kieran Bingham
1415c4ed91 version-gen.sh: Ensure only collectd repository versions are used 
When cross compiling in hosted environments using RPM,
the extracted tar-ball can be located in a parent .git repository.

The version-gen.sh script will then take the version number from
this repository as if it represents collectd.

This can be even more erroneous when the version returned is non
numerical and breaks the build

Signed-off-by: Kieran Bingham <kieran.bingham@st.com>
 2013-09-17 18:38:31 +01:00
Florian Forster
f6b9d3b2d9 Bump version to 5.4.0; Update ChangeLog. 2013-08-18 12:17:30 +02:00
Florian Forster
2b9ee16620 Bump version to 5.3.1; Update ChangeLog. 2013-07-13 11:41:35 +02:00
Florian Forster
022e67641d Bump version to 5.3.0; Update ChangeLog. 2013-04-09 19:08:59 -07:00
Florian Forster
424841e452 Bump version to 5.2.2; Update ChangeLog. 2013-04-08 17:59:28 -07:00
Florian Forster
26ff771b24 Bumped version to 5.2.1; Updated ChangeLog. 2013-01-27 14:24:31 +01:00
Florian Forster
1df2302964 Bump version to 5.2.0; Update ChangeLog. 2012-11-17 13:12:42 +01:00
Florian Forster
3066976a23 Bump version to 5.1.1; Update ChangeLog. 2012-11-11 12:56:53 +01:00
Manuel Luis Sanmartin Rozada
4d3766818c The commit 3bda88e8b4 change the shell from sh to bash. 
To fix the configure script generation error: remove the echo whith \c used in sh.

Note: bash is not installed in AIX by default.
Signed-off-by: Florian Forster <octo@collectd.org>
 2012-10-02 09:44:51 +02:00
Florian Forster
ef7f6073b1 Bump version to 5.1.0; Update ChangeLog. 2012-04-01 17:15:20 +02:00
Florian Forster
ab55c79a0f Merge branch 'collectd-5.0' 2012-04-01 12:07:20 +02:00
Florian Forster
5cf091d2e5 Bump version to 5.0.4; Update ChangeLog. 2012-04-01 12:06:24 +02:00
Cosmin Ioiart
4b84930102 Fixed solaris configure script generation errors 
The brackets in configure.in and the changes in version-gen.sh are needed in order for the build.sh script to generate the configure script correctly. Else the generated script won't work.
 2012-03-19 10:54:57 +01:00
Florian Forster
31ec341b9b Bump version to 5.0.3; Update ChangeLog. 
Change-Id: I3c73ac8b3ac73227e20ea32d052f5bea1575e29a
 2012-02-19 11:12:43 +01:00
Florian Forster
d0bb20feb1 Merge branch 'collectd-4.10' into collectd-5.0 2012-02-03 11:49:04 +01:00