Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Add check for uneven stores' height (backport #14410) #15114

Merged
merged 4 commits into from
Feb 21, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 21, 2023

This is an automatic backport of pull request #14410 done by Mergify.
Cherry-pick of 40ca155 has failed:

On branch mergify/bp/release/v0.45.x/pr-14410
Your branch is up to date with 'origin/release/v0.45.x'.

You are currently cherry-picking commit 40ca1550d.
  (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:   store/rootmulti/store.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	deleted by us:   store/CHANGELOG.md
	both modified:   store/rootmulti/store_test.go

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 40ca155)

# Conflicts:
#	CHANGELOG.md
#	store/CHANGELOG.md
#	store/rootmulti/store_test.go
@tac0turtle tac0turtle merged commit 1bdde19 into release/v0.45.x Feb 21, 2023
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.45.x/pr-14410 branch February 21, 2023 22:27
@faddat faddat mentioned this pull request Mar 23, 2023
19 tasks
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
…osmos#15114)

Co-authored-by: khanh-notional <50263489+catShaark@users.noreply.github.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants