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

refactor: fix description iavl-disable-fastnode cmd flag (backport #13656) #13660

Merged
merged 2 commits into from
Oct 26, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 26, 2022

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

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

You are currently cherry-picking commit c833190a1.
  (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:   simapp/simd/cmd/root.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   server/start.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

…#13656)

(cherry picked from commit c833190)

# Conflicts:
#	server/start.go
@mergify mergify bot requested review from aaronc and alexanderbez as code owners October 26, 2022 14:29
@mergify mergify bot added the conflicts label Oct 26, 2022
@julienrbrt julienrbrt changed the title feat(cli): Add iavl-disable-fastnode cmd flag with proper description (backport #13656) refactor: fix description iavl-disable-fastnode cmd flag (backport #13656) Oct 26, 2022
@tac0turtle tac0turtle merged commit d60d45b into release/v0.45.x Oct 26, 2022
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.45.x/pr-13656 branch October 26, 2022 14:57
nnkken pushed a commit to likecoin/cosmos-sdk that referenced this pull request Nov 16, 2022
…smos#13656) (cosmos#13660)

* feat(cli): Add iavl-disable-fastnode cmd flag with proper description (cosmos#13656)

(cherry picked from commit c833190)

# Conflicts:
#	server/start.go

* fix conflicts

Co-authored-by: William Chong <6198816+williamchong@users.noreply.github.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
…smos#13656) (cosmos#13660)

* feat(cli): Add iavl-disable-fastnode cmd flag with proper description (cosmos#13656)

(cherry picked from commit c833190)

# Conflicts:
#	server/start.go

* fix conflicts

Co-authored-by: William Chong <6198816+williamchong@users.noreply.github.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