Skip to content
This repository has been archived by the owner on Apr 16, 2020. It is now read-only.

Modules lkgr fix conflict #17

Closed
wants to merge 8 commits into from
Closed

Conversation

MylesBorins
Copy link
Contributor

Rebase failure... here's the conflict free rebase

@MylesBorins
Copy link
Contributor Author

guybedford and others added 8 commits November 30, 2018 16:40
Refs: nodejs/modules#180

PR-URL: #6
Reviewed-By: Myles Borins <MylesBorins@google.com>
Reviewed-By: John-David Dalton <john.david.dalton@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Refs: nodejs/modules#180

PR-URL: #6
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: John-David Dalton <john.david.dalton@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Refs: nodejs/modules#180

PR-URL: #6
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: John-David Dalton <john.david.dalton@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Refs: nodejs/modules#180

PR-URL: #6
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: John-David Dalton <john.david.dalton@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: #6
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: John-David Dalton <john.david.dalton@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: #6
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: Myles Borins <mylesborins@google.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
PR-URL: #6
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: Myles Borins <mylesborins@google.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
@MylesBorins MylesBorins force-pushed the modules-lkgr-fix-conflict branch from 6ee40ca to 1fd4251 Compare November 30, 2018 21:40
@MylesBorins
Copy link
Contributor Author

one more rebase and CI https://ci.nodejs.org/job/node-test-pull-request/19098/

@MylesBorins
Copy link
Contributor Author

failures on alpine are being dug into upstream

nodejs/node#22308

@MylesBorins
Copy link
Contributor Author

Landed

@MylesBorins MylesBorins closed this Dec 2, 2018
@targos targos deleted the modules-lkgr-fix-conflict branch December 2, 2018 09:57
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants