Skip to content

Conversation

@addaleax
Copy link
Member

Only trivial conflicts (process.binding() vs internalBinding()).


While it is not entirely clear why this condition is being
triggered, it does resolve a reported bug.

Fixes: #26315
PR-URL: #29912

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • commit message follows commit guidelines

While it is not entirely clear why this condition is being
triggered, it does resolve a reported bug.

Fixes: nodejs#26315

PR-URL: nodejs#29912
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
@nodejs-github-bot nodejs-github-bot added net Issues and PRs related to the net subsystem. v10.x labels Oct 14, 2019
@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Oct 14, 2019

CI: https://ci.nodejs.org/job/node-test-pull-request/26012/
[CI failures are those identified in #29977]

BethGriggs pushed a commit that referenced this pull request Oct 16, 2019
While it is not entirely clear why this condition is being
triggered, it does resolve a reported bug.

Fixes: #26315

Backport-PR-URL: #29968
PR-URL: #29912
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
@BethGriggs
Copy link
Member

Landed on v10.x-staging

@BethGriggs BethGriggs closed this Oct 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

net Issues and PRs related to the net subsystem.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants