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: call SetIAVLCacheSize with the configured value in simapp (backport #13107) #13109

Merged
merged 2 commits into from
Aug 31, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 31, 2022

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

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

You are currently cherry-picking commit ab3334242.
  (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/start.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   simapp/simd/cmd/root.go

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

)

* Call `SetIAVLCacheSize` with the configured value in simapp.

* Update CHANGELOG.md

(cherry picked from commit ab33342)

# Conflicts:
#	CHANGELOG.md
#	simapp/simd/cmd/root.go
@yihuang yihuang removed the conflicts label Aug 31, 2022
@tac0turtle tac0turtle merged commit b897f47 into release/v0.45.x Aug 31, 2022
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.45.x/pr-13107 branch August 31, 2022 12:04
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
…kport cosmos#13107) (cosmos#13109)

* fix: call `SetIAVLCacheSize` with the configured value in simapp (cosmos#13107)

* Call `SetIAVLCacheSize` with the configured value in simapp.

* Update CHANGELOG.md

(cherry picked from commit ab33342)

# Conflicts:
#	CHANGELOG.md
#	simapp/simd/cmd/root.go

* fix conflicts

Co-authored-by: yihuang <huang@crypto.com>
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.

2 participants