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

feat: save restored snapshot locally (backport #16060) #16261

Merged
merged 3 commits into from
May 23, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 23, 2023

This is an automatic backport of pull request #16060 done by Mergify.
Cherry-pick of 81ba019 has failed:

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

You are currently cherry-picking commit 81ba019e5.
  (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:   snapshots/manager_test.go
	modified:   snapshots/store.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   snapshots/manager.go
	deleted by us:   store/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

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
(cherry picked from commit 81ba019)

# Conflicts:
#	snapshots/manager.go
#	store/CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner May 23, 2023 14:47
@mergify mergify bot added the conflicts label May 23, 2023
@github-actions github-actions bot removed the C:Store label May 23, 2023
Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK.

@julienrbrt julienrbrt merged commit d45f360 into release/v0.47.x May 23, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-16060 branch May 23, 2023 19:34
roy-dydx pushed a commit to dydxprotocol/cosmos-sdk that referenced this pull request Jul 11, 2023
…16261)

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.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
…16261)

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.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
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants