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

fix: StateSync Restore by excluding memory store (backport #16449) #16452

Merged
merged 2 commits into from
Jun 7, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 7, 2023

This is an automatic backport of pull request #16449 done by Mergify.
Cherry-pick of d1e685b has failed:

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

You are currently cherry-picking commit d1e685b4d.
  (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 <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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 d1e685b)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner June 7, 2023 23:16
@mergify mergify bot added the conflicts label Jun 7, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) June 7, 2023 23:18
@julienrbrt julienrbrt merged commit 3bbc0aa into release/v0.47.x Jun 7, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-16449 branch June 7, 2023 23:41
roy-dydx pushed a commit to dydxprotocol/cosmos-sdk that referenced this pull request Jul 11, 2023
…) (cosmos#16452)

Co-authored-by: Chill Validation <92176880+chillyvee@users.noreply.github.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
kakysha pushed a commit to InjectiveLabs/cosmos-sdk that referenced this pull request Aug 15, 2023
…) (cosmos#16452)

Co-authored-by: Chill Validation <92176880+chillyvee@users.noreply.github.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

2 participants