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: per module fast nodes (backport #552) #560

Merged
merged 2 commits into from
Mar 8, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 8, 2024

This is an automatic backport of pull request #552 done by Mergify.
Cherry-pick of 11b6186 has failed:

On branch mergify/bp/osmo-v23/v0.47.5/pr-552
Your branch is up to date with 'origin/osmo-v23/v0.47.5'.

You are currently cherry-picking commit 11b6186e0.
  (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:   server/config/config.go
	modified:   server/config/toml.go
	modified:   server/mock/store.go
	modified:   server/start.go
	modified:   server/util.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   baseapp/options.go
	both modified:   store/rootmulti/store.go
	both modified:   store/types/store.go

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 per module fast nodes

* small logic change

* initialize map

* lint

(cherry picked from commit 11b6186)

# Conflicts:
#	baseapp/options.go
#	store/rootmulti/store.go
#	store/types/store.go
@mergify mergify bot added the conflicts label Mar 8, 2024
Copy link
Author

mergify bot commented Mar 8, 2024

Cherry-pick of 11b6186 has failed:

On branch mergify/bp/osmo-v23/v0.47.5/pr-552
Your branch is up to date with 'origin/osmo-v23/v0.47.5'.

You are currently cherry-picking commit 11b6186e0.
  (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:   server/config/config.go
	modified:   server/config/toml.go
	modified:   server/mock/store.go
	modified:   server/start.go
	modified:   server/util.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   baseapp/options.go
	both modified:   store/rootmulti/store.go
	both modified:   store/types/store.go

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

@czarcas7ic czarcas7ic merged commit 604b154 into osmo-v23/v0.47.5 Mar 8, 2024
23 checks passed
@czarcas7ic czarcas7ic deleted the mergify/bp/osmo-v23/v0.47.5/pr-552 branch March 8, 2024 04:22
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