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: nested iterator on cache store (backport #14798) #14823

Merged
merged 2 commits into from
Jan 27, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 27, 2023

This is an automatic backport of pull request #14798 done by Mergify.
Cherry-pick of 76d47b4 has failed:

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

You are currently cherry-picking commit 76d47b4b6.
  (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/cachekv/internal/btree.go
	modified:   store/cachekv/store.go
	modified:   store/cachekv/store_test.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 76d47b4)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot added the conflicts label Jan 27, 2023
@mergify mergify bot mentioned this pull request Jan 27, 2023
19 tasks
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. As said here #14798 (review) this will need to be tested on mainnets again.

@tac0turtle
Copy link
Member

We can merge so we can pull the release branch.

@tac0turtle tac0turtle merged commit f96336f into release/v0.45.x Jan 27, 2023
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.45.x/pr-14798 branch January 27, 2023 23:04
@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
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