Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 30, 2024

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

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

You are currently cherry-picking commit a8991d63e.
  (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:   privval/signer_listener_endpoint.go
	modified:   privval/signer_listener_endpoint_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	added by them:   .changelog/v0.38.3/bug-fixes/2047-privval-retry-accepting-conn.md

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

Before the change, we'd error after just 1 attempt of accepting a
connection.

Co-authored by: @corverroos

Closes #452

Port of corverroos/tendermint#1

---

#### PR checklist

- [x] Tests written/updated
- [x] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [x] Updated relevant documentation (`docs/` or `spec/`) and code
comments

(cherry picked from commit a8991d6)

# Conflicts:
#	.changelog/v0.38.3/bug-fixes/2047-privval-retry-accepting-conn.md
@mergify mergify bot added the conflicts label Jan 30, 2024
@mergify mergify bot requested a review from a team as a code owner January 30, 2024 10:59
@melekes melekes merged commit 6b9defb into v0.38.x Jan 30, 2024
@melekes melekes deleted the mergify/bp/v0.38.x/pr-2047 branch January 30, 2024 11:26
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