8000 fix(p2p/pex): fix TestConnectionSpeedForPeerReceivedFromSeed (backport #4660) by mergify[bot] · Pull Request #4662 · cometbft/cometbft · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix(p2p/pex): fix TestConnectionSpeedForPeerReceivedFromSeed (backport #4660) #4662

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Dec 13, 2024
Merged

fix(p2p/pex): fix TestConnectionSpeedForPeerReceivedFromSeed (backport #4660) #4662

merged 2 commits into from
Dec 13, 2024

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Dec 13, 2024
This is an automatic backport of pull request #4660 done by [Mergify](https://mergify.com).

@melekes @mergify
fix(p2p/pex): fix TestConnectionSpeedForPeerReceivedFromSeed (#4660)
89b02a4 
(cherry picked from commit 67ddff0)

# Conflicts:
#	p2p/pex/pex_reactor_test.go
@mergify mergify bot requested a review from a team as a code owner December 13, 2024 10:09
@mergify mergify bot added the conflicts label Dec 13, 2024
@mergify Mergify
Copy link
Contributor Author
mergify bot commented Dec 13, 2024

Cherry-pick of 67ddff0 has failed:

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

You are currently cherry-picking commit 67ddff09.
  (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:   p2p/pex/pex_reactor_test.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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@melekes melekes merged commit 8e05a0b into v0.38.x Dec 13, 2024
18 checks passed
@melekes melekes deleted the mergify/bp/v0.38.x/pr-4660 branch December 13, 2024 11:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@melekes melekes melekes approved these changes

Assignees

@melekes melekes

Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@melekes
0