From 99e490e9e76edfc09fa0153b442ff476a2e6e36b Mon Sep 17 00:00:00 2001 From: Adam Tucker Date: Sun, 24 Mar 2024 17:06:33 -0500 Subject: [PATCH] changelog and backport (#589) (cherry picked from commit fb4c916c2af97a674437012dfc2d0dd0ccf1fe3d) --- .github/mergify.yml | 8 ++++++++ CHANGELOG.md | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 33a3fa0cce8e..13d3c0437bfe 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -39,3 +39,11 @@ pull_request_rules: branches: - osmo-v23/v0.47.5 - osmo-v23/v0.47.5-iavl-v1 + - name: backport patches to v24 branch + conditions: + - base=osmo/v0.47.5 + - label=A:backport/v24 + actions: + backport: + branches: + - osmo-v24/v0.47.5 diff --git a/CHANGELOG.md b/CHANGELOG.md index 01329c14d4b1..5b6ee3ad6d26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,12 +49,19 @@ Ref: https://keepachangelog.com/en/1.0.0/ ## [State Compatible] -* (coin) [#570](https://github.com/osmosis-labs/cosmos-sdk/pull/570) Removal of regex usage on denom validation +## v24 + +## [v0.47.5-v24-osmo-1](https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v24-osmo-1) ## IAVL v23 v1 Releases ## [Unreleased IAVL v1] +## [v0.47.5-v23-osmo-7-iavl-v1](https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-7-iavl-v1) + +* (coin) [#570](https://github.com/osmosis-labs/cosmos-sdk/pull/570) Removal of regex usage on denom validation +* (iavl) [#586](https://github.com/osmosis-labs/cosmos-sdk/pull/586) Increment IAVL version + ## [v0.47.5-v23-osmo-6-iavl-v1](https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v23-osmo-6-iavl-v1) * (store) [#575](https://github.com/osmosis-labs/cosmos-sdk/pull/575) Bumps IAVL v1 version for bug fixes