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: avoid broadcasting tx through query (backport #15044) #15048

Merged
merged 4 commits into from
Feb 16, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 16, 2023

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

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

You are currently cherry-picking commit c884e276f.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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 c884e27)

# Conflicts:
#	baseapp/abci.go
@mergify mergify bot requested a review from aaronc as a code owner February 16, 2023 15:14
@mergify mergify bot added the conflicts label Feb 16, 2023
@mergify mergify bot requested a review from alexanderbez as a code owner February 16, 2023 15:14
@julienrbrt
Copy link
Member

Gonna prepare the release notes here, please don't merge yet.

@julienrbrt julienrbrt merged commit 140ebff into release/v0.45.x Feb 16, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.45.x/pr-15044 branch February 16, 2023 16:15
julienrbrt added a commit that referenced this pull request Feb 22, 2023
Co-authored-by: Facundo Medica <14063057+facundomedica@users.noreply.github.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
@faddat faddat mentioned this pull request Mar 23, 2023
19 tasks
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