From 13844c74aedc7961c21ce48c7c9913a63bca030b Mon Sep 17 00:00:00 2001 From: Cory Date: Thu, 25 Feb 2021 16:48:21 -0800 Subject: [PATCH 1/2] Add warning notice in changelog for v0.41.x bug (ref: #8461) (#8707) * add disclaimer for v0.41 series for non-hub SDK chains due to #8461 * update issue link * update issue link, pt2 * fix bad issue link (cherry picked from commit b19ac2c4f8dd3a3f700a41076c136dea5c812308) # Conflicts: # CHANGELOG.md --- CHANGELOG.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0f76e1f0808..ec722b6d3baa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,7 +53,24 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (x/slashing) [\#8427](https://github.com/cosmos/cosmos-sdk/pull/8427) Fix query signing infos command * (server) [\#8399](https://github.com/cosmos/cosmos-sdk/pull/8399) fix gRPC-web flag default value * (server) [\#8641](https://github.com/cosmos/cosmos-sdk/pull/8641) Fix Tendermint and application configuration reading from file +<<<<<<< HEAD >>>>>>> 2f069c90b... server: fix interceptConfigs (#8641) +======= + +## [v0.41.3](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.41.3) - 2021-02-18 + +**IMPORTANT:** Due to a bug in the `v0.41.x` series with how evidence handles validator consensus addresses [\#8461](https://github.com/cosmos/cosmos-sdk/issues/8461), SDK based chains that are not using the default bech32 prefix (`cosmos`, aka all chains except for the Cosmos Hub) **should not** use this release or any release in the `v0.41.x` series. Please see [\#8668](https://github.com/cosmos/cosmos-sdk/issues/8668) for tracking & timeline for the v0.42.0 release, which will include a fix for this issue. + +### Bug Fixes + +* [\#8617](https://github.com/cosmos/cosmos-sdk/pull/8617) Fix build failures caused by a small API breakage introduced in tendermint v0.34.7. + +## [v0.41.2](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.41.2) - 2021-02-18 + +### Improvements + +* Bump tendermint dependency to v0.34.7. +>>>>>>> b19ac2c4f... Add warning notice in changelog for v0.41.x bug (ref: #8461) (#8707) ## [v0.41.1](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.41.1) - 2021-02-17 From d8c97a913c51c6b72b7a336a67b471bf235bbba3 Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Fri, 26 Feb 2021 04:04:10 +0000 Subject: [PATCH 2/2] resolve conflicts --- CHANGELOG.md | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec722b6d3baa..277f93aafeef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,33 +34,12 @@ Ref: https://keepachangelog.com/en/1.0.0/ # Changelog -## [v0.41.3](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.41.3) - 2021-02-18 - -### Bug Fixes +## [Unreleased] -* [\#8617](https://github.com/cosmos/cosmos-sdk/pull/8617) Fix build failures caused by a small API breakage introduced in tendermint v0.34.7. - -## [v0.41.2](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.41.2) - 2021-02-18 - -### Improvements - -<<<<<<< HEAD -* Bump tendermint dependency to v0.34.7. -======= -### Bug Fixes - -* (x/evidence) [#8461](https://github.com/cosmos/cosmos-sdk/pull/8461) Fix bech32 prefix in evidence validator address conversion -* (x/slashing) [\#8427](https://github.com/cosmos/cosmos-sdk/pull/8427) Fix query signing infos command -* (server) [\#8399](https://github.com/cosmos/cosmos-sdk/pull/8399) fix gRPC-web flag default value -* (server) [\#8641](https://github.com/cosmos/cosmos-sdk/pull/8641) Fix Tendermint and application configuration reading from file -<<<<<<< HEAD ->>>>>>> 2f069c90b... server: fix interceptConfigs (#8641) -======= +**IMPORTANT:** Due to a bug in the `v0.41.x` series with how evidence handles validator consensus addresses [\#8461](https://github.com/cosmos/cosmos-sdk/issues/8461), SDK based chains that are not using the de$ ## [v0.41.3](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.41.3) - 2021-02-18 -**IMPORTANT:** Due to a bug in the `v0.41.x` series with how evidence handles validator consensus addresses [\#8461](https://github.com/cosmos/cosmos-sdk/issues/8461), SDK based chains that are not using the default bech32 prefix (`cosmos`, aka all chains except for the Cosmos Hub) **should not** use this release or any release in the `v0.41.x` series. Please see [\#8668](https://github.com/cosmos/cosmos-sdk/issues/8668) for tracking & timeline for the v0.42.0 release, which will include a fix for this issue. - ### Bug Fixes * [\#8617](https://github.com/cosmos/cosmos-sdk/pull/8617) Fix build failures caused by a small API breakage introduced in tendermint v0.34.7. @@ -70,7 +49,6 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Improvements * Bump tendermint dependency to v0.34.7. ->>>>>>> b19ac2c4f... Add warning notice in changelog for v0.41.x bug (ref: #8461) (#8707) ## [v0.41.1](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.41.1) - 2021-02-17