Skip to content

fix: iavl pruning issue move onto next version if stuck (backport #9334)#9336

Merged
PaddyMc merged 2 commits intov29.xfrom
mergify/bp/v29.x/pr-9334
Mar 26, 2025
Merged

fix: iavl pruning issue move onto next version if stuck (backport #9334)#9336
PaddyMc merged 2 commits intov29.xfrom
mergify/bp/v29.x/pr-9334

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 26, 2025

* fix: iavl pruning issue move onto next version if stuck

* chore: add CHANGELOG.md

(cherry picked from commit 45d3e29)

# Conflicts:
#	osmoutils/go.mod
@mergify mergify bot added the conflicts label Mar 26, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Mar 26, 2025

Cherry-pick of 45d3e29 has failed:

On branch mergify/bp/v29.x/pr-9334
Your branch is up to date with 'origin/v29.x'.

You are currently cherry-picking commit 45d3e299.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.md
	modified:   go.mod
	modified:   go.sum
	modified:   osmoutils/go.sum

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   osmoutils/go.mod

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions
Copy link
Contributor

Important Notice

This PR modifies an in-repo Go module. It is one of:

  • osmomath
  • osmoutils
  • x/ibc-hooks
  • x/epochs

The dependent Go modules, especially the root one, will have to be
updated to reflect the changes. Failing to do so might cause e2e to fail.

Please follow the instructions below:

  1. Open https://github.com/osmosis-labs/osmosis/actions/workflows/go-mod-auto-bump.yml
  2. Provide the current branch name
  3. On success, confirm if an automated commit corretly updated the go.mod and go.sum files

Please let us know if you need any help.

@PaddyMc PaddyMc merged commit c89bdc0 into v29.x Mar 26, 2025
1 check passed
@PaddyMc PaddyMc deleted the mergify/bp/v29.x/pr-9334 branch March 26, 2025 21:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant