Add missing commits to v4.x-staging#4730
Closed
Trott wants to merge 2 commits intonodejs:v4.x-stagingfrom
Closed
Conversation
test-http-pipeline-flood has been flaky on Windows for some time. Hopefully, nodejs#2862 fixes it and lands soon, but until then, let's mark it as flaky. PR-URL: nodejs#3616 Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
This extends fixes for test-https-pipeline-flood to hopefully fully eliminate its flakiness on Windows in our continuous integration process. PR-URL: nodejs#3636 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Trott
added
test
Member
|
that's what I see for this, no changes .. ? |
Member
Author
|
Ah, I missed that a third commit moved the file into parallel and that commit has already landed on v4.x-staging. So the sum total of these two commits with that commit would be no change. Closing. |
Contributor
|
Can you add do-not-land-onv4.x label to the commits in question?
|
Member
Author
|
@thealphanerd I've added the label to the relevant pull requests (#3616 and #3636) and removed the other v4.x labels from #3636. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds a pair of commits that have landed in master that are currently not in v4.x-staging.
Ref: #4698