Skip to content

Conversation

@Fishrock123
Copy link
Contributor

Pull Request check-list

  • Does make -j8 test (UNIX) or vcbuild test nosign (Windows) pass with
    this change (including linting)?
  • Is the commit message formatted according to CONTRIBUTING.md?

Affected core subsystem(s)

src,lib

Description of change

backport of #5103 onto v5.x

cc @evanlucas

PR-URL: nodejs#5103
Reviewed-By: Trevor Norris <[email protected]>
Reviewed-By: James M Snell <[email protected]>

Conflicts:
	node.gyp
	src/node.js
PR-URL: nodejs#5103
Reviewed-By: Trevor Norris <[email protected]>
Reviewed-By: James M Snell <[email protected]>
PR-URL: nodejs#5103
Reviewed-By: Trevor Norris <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@Fishrock123 Fishrock123 added the lib / src Issues and PRs related to general changes in the lib or src directory. label Mar 31, 2016
@Fishrock123
Copy link
Contributor Author

@evanlucas
Copy link
Contributor

LGTM

@MylesBorins
Copy link
Contributor

@Fishrock123 looks like this branch has conflicts (based on the github notice)

@Fishrock123
Copy link
Contributor Author

It didn't. I think that is because @evanlucas landed it?

@evanlucas
Copy link
Contributor

ah yea, sorry forgot to comment

@evanlucas
Copy link
Contributor

Landed in v5.x in 40847b0, a757e05, and e3c7b46

@evanlucas evanlucas closed this Mar 31, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lib / src Issues and PRs related to general changes in the lib or src directory.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants