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

p2p/nat: skip TestUPNP in non-CI envs if discover fails #380

Merged

Conversation

meowsbits
Copy link
Member

ethereum/go-ethereum#21476

Date: 2021-05-13 12:33:01-05:00
Signed-off-by: meows b5c6@protonmail.com

Copy link
Member

@ziogaschr ziogaschr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great to have this in! Thanks

@meowsbits
Copy link
Member Author

meowsbits commented May 14, 2021

I just added the pending upstream label; let's see what the folks at EF think about it, too.

@meowsbits
Copy link
Member Author

No word from EF yet. Going ahead with merge.

Base automatically changed from merge/foundation-release/1.10.3 to release/1.12-rc1 May 24, 2021 19:05
@ziogaschr
Copy link
Member

SGTM

ethereum/go-ethereum#21476

Date: 2021-05-13 12:33:01-05:00
Signed-off-by: meows <b5c6@protonmail.com>
@meowsbits meowsbits force-pushed the merge/foundation-release/1.10.3-upnp-test branch from 9448508 to 12abdf4 Compare May 25, 2021 10:55
@meowsbits
Copy link
Member Author

Just rebased on the base branch to give the CIs a second chance.

@meowsbits meowsbits merged commit f419887 into release/1.12-rc1 May 25, 2021
@meowsbits meowsbits deleted the merge/foundation-release/1.10.3-upnp-test branch May 25, 2021 14:12
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.

2 participants