Skip to content

perf(consensus): Make one peer state mutex call in AddVote (#3156) (backport #91)#93

Merged
ValarDragon merged 3 commits intoosmo-v25/v0.37.4from
mergify/bp/osmo-v25/v0.37.4/pr-91
Jun 3, 2024
Merged

perf(consensus): Make one peer state mutex call in AddVote (#3156) (backport #91)#93
ValarDragon merged 3 commits intoosmo-v25/v0.37.4from
mergify/bp/osmo-v25/v0.37.4/pr-91

Conversation

@mergify
Copy link

@mergify mergify bot commented Jun 3, 2024

Closes cometbft#3155


  • Tests written/updated
  • Changelog entry added in .changelog (we use unclog to manage our changelog)
  • Updated relevant documentation (docs/ or spec/) and code comments
  • Title follows the Conventional Commits spec

PR checklist

  • Tests written/updated
  • Changelog entry added in .changelog (we use unclog to manage our changelog)
  • Updated relevant documentation (docs/ or spec/) and code comments

This is an automatic backport of pull request #91 done by [Mergify](https://mergify.com).

ValarDragon and others added 2 commits June 3, 2024 15:33
…3156)

Closes cometbft#3155

---

- [ ] Tests written/updated
- [x] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code
comments
- [x] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec

(cherry picked from commit 3cdc621)
(cherry picked from commit 76006d5)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot added the conflicts label Jun 3, 2024
@mergify
Copy link
Author

mergify bot commented Jun 3, 2024

Cherry-pick of 76006d5 has failed:

On branch mergify/bp/osmo-v25/v0.37.4/pr-91
Your branch is ahead of 'origin/osmo-v25/v0.37.4' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 76006d581.
  (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:
	new file:   go.work.sum

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ValarDragon ValarDragon merged commit b6d8718 into osmo-v25/v0.37.4 Jun 3, 2024
@mergify mergify bot deleted the mergify/bp/osmo-v25/v0.37.4/pr-91 branch June 3, 2024 15:46
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.

1 participant