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(ve): Ensure that sdk side ve math matches cometbft (backport #19200) #19251

Merged
merged 2 commits into from
Jan 25, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 25, 2024

This is an automatic backport of pull request #19200 done by Mergify.
Cherry-pick of 8120a86 has failed:

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

You are currently cherry-picking commit 8120a86ea.
  (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:   baseapp/abci_test.go
	modified:   baseapp/abci_utils.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 8120a86)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner January 25, 2024 17:18
@mergify mergify bot added the conflicts label Jan 25, 2024
@alexanderbez alexanderbez enabled auto-merge (squash) January 25, 2024 18:31
@alexanderbez alexanderbez merged commit 0abf94a into release/v0.50.x Jan 25, 2024
42 of 45 checks passed
@alexanderbez alexanderbez deleted the mergify/bp/release/v0.50.x/pr-19200 branch January 25, 2024 18:39
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.

2 participants