Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Fix udp port check retry and check all udp ports (bp #10385) #10576

Merged
merged 2 commits into from
Jun 15, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 14, 2020

This is an automated backport of pull request #10385 done by Mergify

Cherry-pick of a39df7e has failed:

On branch mergify/bp/v1.1/pr-10385
Your branch is up to date with 'origin/v1.1'.

You are currently cherry-picking commit a39df7ee5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   net-utils/src/ip_echo_server.rs
	modified:   net-utils/src/lib.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   validator/src/main.rs

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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 simulator.

Finally, you can contact us on https://mergify.io/

* Don't start if udp port is really closed

* Fully check all udp ports

* Remove test code.......

* Add tests and adjust impl a bit

* Add comment

* Move comment a bit

* Move a bit

* clean ups

(cherry picked from commit a39df7e)

# Conflicts:
#	validator/src/main.rs
@mergify mergify bot added the conflicts label Jun 14, 2020
@ryoqun ryoqun added automerge Merge this Pull Request automatically once CI passes and removed conflicts labels Jun 14, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jun 15, 2020
@codecov
Copy link

codecov bot commented Jun 15, 2020

Codecov Report

Merging #10576 into v1.1 will decrease coverage by 0.0%.
The diff coverage is 95.0%.

@@           Coverage Diff            @@
##            v1.1   #10576     +/-   ##
========================================
- Coverage   81.1%    81.0%   -0.1%     
========================================
  Files        292      292             
  Lines      68531    68595     +64     
========================================
+ Hits       55584    55624     +40     
- Misses     12947    12971     +24     

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 15, 2020
@solana-grimes solana-grimes merged commit bc808d7 into v1.1 Jun 15, 2020
@mergify mergify bot deleted the mergify/bp/v1.1/pr-10385 branch June 15, 2020 00:36
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants