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(baseapp): introduce mutex to state (backport #18846) #18863

Merged
merged 4 commits into from
Dec 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 21, 2023

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

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

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

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

Co-authored-by: Aleksandr Bezobchuk <[email protected]>
(cherry picked from commit c519104)

# Conflicts:
#	baseapp/abci.go
@mergify mergify bot requested a review from a team as a code owner December 21, 2023 19:07
@mergify mergify bot added the conflicts label Dec 21, 2023
Copy link
Contributor

@tac0turtle your pull request is missing a changelog!

@alexanderbez alexanderbez enabled auto-merge (squash) December 22, 2023 16:34
@alexanderbez alexanderbez merged commit 52c3db2 into release/v0.50.x Dec 22, 2023
42 of 45 checks passed
@alexanderbez alexanderbez deleted the mergify/bp/release/v0.50.x/pr-18846 branch December 22, 2023 17:46
@faddat faddat mentioned this pull request Nov 8, 2024
12 tasks
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.

3 participants