Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 7, 2023

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

On branch mergify/bp/v0.37.x/pr-1079
Your branch is up to date with 'origin/v0.37.x'.

You are currently cherry-picking commit cf230821c.
  (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:   state/execution.go

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

* Log proposer when logging received proposal

* Addressed review comments

* Promote updates to validator to Info level

(cherry picked from commit cf23082)

# Conflicts:
#	consensus/state.go
@mergify mergify bot requested a review from a team as a code owner August 7, 2023 16:37
@mergify mergify bot added the conflicts label Aug 7, 2023
* Log proposer when logging received proposal

* Addressed review comments

* Promote updates to validator to Info level
@sergio-mena sergio-mena added logs Anything relating to logging and removed conflicts labels Aug 8, 2023
@sergio-mena sergio-mena merged commit 88ce9ee into v0.37.x Aug 10, 2023
@sergio-mena sergio-mena deleted the mergify/bp/v0.37.x/pr-1079 branch August 10, 2023 15:02
nivasan1 pushed a commit to skip-mev/cometbft that referenced this pull request Jan 16, 2024
…ometbft#1079) (cometbft#1221)

* Log proposer's address when correctly accepting a proposal (cometbft#1079)

* Log proposer when logging received proposal

* Addressed review comments

* Promote updates to validator to Info level

(cherry picked from commit cf23082)

# Conflicts:
#	consensus/state.go

* Revert "Log proposer's address when correctly accepting a proposal (cometbft#1079)"

This reverts commit b2aaa8f.

* Log proposer's address when correctly accepting a proposal (cometbft#1079)

* Log proposer when logging received proposal

* Addressed review comments

* Promote updates to validator to Info level

---------

Co-authored-by: Sergio Mena <sergio@informal.systems>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
logs Anything relating to logging
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

1 participant