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: iavl v1 (backport #7582) #7585

Closed
wants to merge 1 commit into from
Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 22, 2024

This is an automatic backport of pull request #7582 done by Mergify.
Cherry-pick of 3f7d1a7 has failed:

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

You are currently cherry-picking commit 3f7d1a70.
  (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:   osmomath/go.mod
	modified:   osmomath/go.sum
	modified:   osmoutils/accum/accum_test.go
	modified:   osmoutils/go.mod
	modified:   osmoutils/sumtree/legacy/v101/tree_test.go
	modified:   osmoutils/sumtree/tree_test.go
	new file:   osmoutils/wrapper/tmdb.go
	modified:   x/ibc-hooks/go.mod

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   osmoutils/go.sum
	both modified:   x/epochs/go.mod
	both modified:   x/epochs/go.sum
	both modified:   x/ibc-hooks/go.sum

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


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

* iavl v1

* iavl v1

(cherry picked from commit 3f7d1a7)

# Conflicts:
#	osmoutils/go.sum
#	x/epochs/go.mod
#	x/epochs/go.sum
#	x/ibc-hooks/go.sum
@mergify mergify bot requested a review from mattverse as a code owner February 22, 2024 14:15
@mergify mergify bot added the conflicts label Feb 22, 2024
@mergify mergify bot requested a review from nicolaslara as a code owner February 22, 2024 14:15
@czarcas7ic czarcas7ic closed this Feb 22, 2024
@mergify mergify bot deleted the mergify/bp/v23.x/pr-7582 branch February 22, 2024 18:06
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