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: Create ABCI++ Verfication Methods (backport #15298) #15314

Merged
merged 9 commits into from
Mar 8, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 8, 2023

This is an automatic backport of pull request #15298 done by Mergify.
Cherry-pick of 4932f11 has failed:

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

You are currently cherry-picking commit 4932f115d.
  (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:   docs/docs/building-apps/02-app-mempool.md
	modified:   simapp/app.go
	modified:   simapp/app_v2.go

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

(cherry picked from commit 4932f11)

# Conflicts:
#	baseapp/baseapp.go
@mergify mergify bot requested a review from a team as a code owner March 8, 2023 19:20
@mergify mergify bot added the conflicts label Mar 8, 2023
baseapp/baseapp.go Fixed Show fixed Hide fixed
baseapp/baseapp.go Fixed Show fixed Hide fixed
@alexanderbez alexanderbez enabled auto-merge (squash) March 8, 2023 19:47
@julienrbrt julienrbrt disabled auto-merge March 8, 2023 19:57
…os/cosmos-sdk into mergify/bp/release/v0.47.x/pr-15298
@julienrbrt
Copy link
Member

@alexanderbez, what do you think of not introducing coackroach erors in v0.47?
Didn't mean to push 2182e51 sorry.

@alexanderbez alexanderbez enabled auto-merge (squash) March 8, 2023 20:02
@julienrbrt julienrbrt force-pushed the mergify/bp/release/v0.47.x/pr-15298 branch from 443c731 to b072a4a Compare March 8, 2023 20:05
@alexanderbez alexanderbez merged commit 818f6a0 into release/v0.47.x Mar 8, 2023
@alexanderbez alexanderbez deleted the mergify/bp/release/v0.47.x/pr-15298 branch March 8, 2023 21:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants