diff --git a/CHANGELOG.md b/CHANGELOG.md index aed05628bb..18e4da8b04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,19 +11,21 @@ We use *breaking* word for marking changes that are not backward compatible (rel ## Unreleased +## [v0.2.1](https://github.com/improbable-eng/thanos/releases/tag/v0.2.1) - 2018.12.27 + ### Added - Relabel drop for Thanos Ruler to enable replica label drop and alert deduplication on AM side. -- Query: Stores UI page available at `/stores` +- Query: Stores UI page available at `/stores`. ![](./docs/img/query_ui_stores.png) ### Fixed -- Thanos Rule Alertmanager DNS SD bug +- Thanos Rule Alertmanager DNS SD bug. - DNS SD bug when having SRV results with different ports. - Move handling of HA alertmanagers to be the same as Prometheus. -- Azure iteration implementation flaw (#695) +- Azure iteration implementation flaw. ## [v0.2.0](https://github.com/improbable-eng/thanos/releases/tag/v0.2.0) - 2018.12.10 diff --git a/VERSION b/VERSION index 341cf11faf..7dff5b8921 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2.0 \ No newline at end of file +0.2.1 \ No newline at end of file diff --git a/docs/release_process.md b/docs/release_process.md index b0425dcc8b..f1938fc551 100644 --- a/docs/release_process.md +++ b/docs/release_process.md @@ -39,6 +39,8 @@ Process of cutting a new *minor* Thanos release: Go to the releases page of the project, click on the `Draft a new release` button and select the tag you just pushed. Describe release and post relevant entry from changelog. Click `Save draft` rather than `Publish release` at this time. (This will prevent the release being visible before it has got the binaries attached to it.) Once tarballs are published on release page, you can click `Publish` and release is complete. Announce `#thanos` slack channel. +1. After release on second PR just after, add `-master` [VERSION file](./VERSION) suffix to the end of version. This will ensure master built images will have different version then released one. + ## Branch management and versioning strategy We use [Semantic Versioning](http://semver.org/).