Skip to content
This repository was archived by the owner on Oct 15, 2020. It is now read-only.

Commit b165ac7

Browse files
chakrabotchakrabot
committed
meta: merge node/master into node-chakracore/master
Merge 53aaa55 as of 2018-04-06 This commit was automatically generated. For any problems, please contact jackhorton Reviewed-By: chakrabot <[email protected]>
2 parents ed29231 + 53aaa55 commit b165ac7

40 files changed

Lines changed: 1435 additions & 283 deletions

‎.mailmap‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ Aaron Heckmann <[email protected]> <[email protected]>
33
Aayush Ahuja <[email protected]> aayush.a <[email protected]>
44
Abe Fettig <[email protected]> <[email protected]>
55
Akito Ito <[email protected]> <[email protected]>
6+
Alejandro Estrada <[email protected]>
7+
Alejandro Estrada <[email protected]> <[email protected]>
68
Alejandro Oviedo Garcia <[email protected]> Alejandro Oviedo <[email protected]>
79
Alex Gilbert <[email protected]> agilbert <[email protected]>
810
Alex Hultman <[email protected]> <[email protected]>
@@ -30,6 +32,8 @@ Artur G Vieira <[email protected]> Artur Vieira <[email protected]
3032
Arnout Kazemier <[email protected]> <[email protected]>
3133
Asaf David <[email protected]> asafdav2 <[email protected]>
3234
Ashley Maceli <[email protected]> ashleyraymaceli <[email protected]>
35+
Ashok Suthar <[email protected]>
36+
Ashutosh Kumar Singh <[email protected]>
3337
Atsuo Fukaya <[email protected]>
3438
Ben Lugavere <[email protected]> blugavere <[email protected]>
3539
Ben Noordhuis <[email protected]> <bnoordhuis@bender.(none)>
@@ -59,15 +63,17 @@ Calvin Metcalf <[email protected]> <[email protected]>
5963
Calvin Metcalf <[email protected]> <[email protected]>
6064
Caralyn Reisle <[email protected]> creisle <[email protected]>
6165
Charles <[email protected]> <[email protected]>
62-
Chew Choon Keat <[email protected]>
6366
Charles Rudolph <[email protected]>
67+
Chen Gang <[email protected]>
68+
Chew Choon Keat <[email protected]>
6469
Chris Andrews <[email protected]> cpandrews8 <[email protected]>
6570
Chris Johnson <[email protected]>
6671
Chris Young <[email protected]> <[email protected]>
6772
Claudio Rodriguez <[email protected]> <[email protected]>
6873
Colin Ihrig <[email protected]>
6974
Christophe Naud-Dulude <[email protected]> Chris911 <[email protected]>
7075
Christopher Lenz <[email protected]> <[email protected]>
76+
Damien Simonin Feugas <[email protected]>
7177
Dan Kaplun <[email protected]> <[email protected]>
7278
Dan Williams <[email protected]> Dan.Williams <[email protected]>
7379
Daniel Abrão <[email protected]> Daniel Abrão <[email protected]>>
@@ -116,6 +122,7 @@ Friedemann Altrock <[email protected]>
116122
Fuji Goro <[email protected]>
117123
Gabriel de Perthuis <[email protected]>
118124
Gareth Ellis <[email protected]> <[email protected]>
125+
Garwah Lam <[email protected]>
119126
Geoffrey Bugaisky <[email protected]> gbugaisky <[email protected]>
120127
Gibson Fahnestock <[email protected]> <[email protected]>
121128
Gil Pedersen <[email protected]> <[email protected]>
@@ -125,6 +132,7 @@ Gregor Martynus <[email protected]> Gregor <[email protected]>
125132
Guy Bedford <[email protected]> guybedford <[email protected]>
126133
Halil İbrahim Şener <[email protected]> hisener <[email protected]>
127134
Hannah Kim <[email protected]> heeeunkimmm <[email protected]>
135+
Hannes Magnusson <[email protected]> <[email protected]>
128136
Hendrik Schwalm <[email protected]> hschwalm <[email protected]>
129137
Hitesh Kanwathirtha <[email protected]> <[email protected]>
130138
Henry Chin <[email protected]>
@@ -168,6 +176,7 @@ Jonathan Gourlay <[email protected]> mrgorbo <[email protected]>
168176
Jonathan Ong <[email protected]> <[email protected]>
169177
Jonathan Persson <[email protected]> <[email protected]>
170178
Jonathan Rentzsch <[email protected]>
179+
Joseph Leon <[email protected]>
171180
Jose Luis Vivero <[email protected]> jlvivero <[email protected]>
172181
Josh Erickson <[email protected]>
173182
Josh Hunter <[email protected]> jopann <[email protected]>
@@ -180,21 +189,26 @@ Junliang Yan <[email protected]>
180189
Junliang Yan <[email protected]> <[email protected]>
181190
Junshu Okamoto <[email protected]> jun-oka <[email protected]>
182191
Justin Beckwith <[email protected]> <[email protected]>
192+
Justin Lee <[email protected]> <[email protected]>
183193
Jérémy Lal <[email protected]>
184194
Jérémy Lal <[email protected]> <[email protected]>
195+
Juan Sebastian Velez Posada <[email protected]>
185196
Kai Sasaki Lewuathe <[email protected]>
186197
Karl Skomski <[email protected]> <[email protected]>
187198
Kathy Truong <[email protected]> k3kathy <[email protected]>
188199
Kazuyuki Yamada <[email protected]>
189200
Keith M Wesolowski <[email protected]> <[email protected]>
190201
Kelsey Breseman <[email protected]>
202+
Ke Ding <[email protected]>
191203
Khaidi Chu <[email protected]> XadillaX <[email protected]>
192204
Khaidi Chu <[email protected]> <[email protected]>
193205
Kiyoshi Nomo <[email protected]> kysnm <[email protected]>
194206
Koichi Kobayashi <[email protected]>
207+
Kostiantyn Wandalen <[email protected]>
195208
Kris Kowal <[email protected]>
196209
Kyle Robinson Young <[email protected]>
197210
Lakshmi Swetha Gopireddy <[email protected]> LAKSHMI SWETHA GOPIREDDY <[email protected]>
211+
Leeseean Chiu <[email protected]>
198212
Luke Bayes <[email protected]>
199213
Lydia Kats <[email protected]> Lydia Katsamberis <[email protected]>
200214
Maciej Małecki <[email protected]> <[email protected]>
@@ -210,12 +224,14 @@ Marti Martz <[email protected]>
210224
Martial James Jefferson <[email protected]>
211225
Martijn Schrage <[email protected]> Oblosys <[email protected]>
212226
Matheus Marchini <[email protected]> <[email protected]>
227+
Matheus Marchini <[email protected]> <[email protected]>
213228
Matt Lang <[email protected]> matt-in-a-hat <[email protected]>
214229
Matt Reed <[email protected]> matthewreed26 <[email protected]>
215230
Matthias Bastian <[email protected]> piepmatz <[email protected]>
216231
Mathias Buus <[email protected]> <[email protected]>
217232
Mathias Pettersson <[email protected]>
218233
Matthew Lye <[email protected]>
234+
Matthew Turner <[email protected]> <[email protected]>
219235
Maurice Hayward <[email protected]> maurice_hayward <[email protected]>
220236
Michael Bernstein <[email protected]>
221237
Michael Dawson <[email protected]> <[email protected]>
@@ -237,17 +253,22 @@ Myles Borins <[email protected]> <[email protected]>
237253
Nebu Pookins<[email protected]>
238254
Netto Farah <[email protected]> nettofarah <[email protected]>
239255
Nicholas Kinsey <[email protected]>
256+
Nick Soggin <[email protected]> <[email protected]>
240257
Nikolai Vavilov <[email protected]>
258+
Nils Kuhnhenn <[email protected]>
241259
Noah Rose Ledesma <[email protected]> Noah Rose <[email protected]>
242260
Noah Rose Ledesma <[email protected]> <[email protected]>
261+
Oluwaseun Omoyajowo <[email protected]>
243262
Onne Gorter <[email protected]>
244263
Paul Querna <[email protected]> <[email protected]>
245264
Pedro Lima <[email protected]> Pedro Victor <[email protected]>
246265
Pedro Lima <[email protected]> Pedro lima <[email protected]>
247266
Peng Lyu <[email protected]> rebornix <[email protected]>
248267
Peter Flannery <[email protected]>
268+
Peter Marton <[email protected]> <[email protected]>
249269
Peter Paugh <[email protected]> Peter <[email protected]>
250270
Phillip Johnsen <[email protected]> <[email protected]>
271+
Prateek Singh <[email protected]> <[email protected]>
251272
Rachel White <[email protected]> rachelnicole <[email protected]>
252273
Ratikesh Misra <[email protected]>
253274
Ravindra Barthwal <[email protected]> Ravindra barthwal <[email protected]>
@@ -270,6 +291,7 @@ Ruben Bridgewater <[email protected]> <[email protected]>
270291
Russell Dempsey <[email protected]> <[email protected]>
271292
Ryan Dahl <[email protected]>
272293
Ryan Emery <[email protected]>
294+
Ryan Mahan <[email protected]>
273295
Ryan Scheel <[email protected]> Ryan Scheel <[email protected]>
274296
Ryan Scheel <[email protected]> Ryan Scheel (Havvy) <[email protected]>
275297
Saad Quadri <[email protected]> saadq <[email protected]>
@@ -303,6 +325,7 @@ Sreepurna Jasti <[email protected]> sreepurnajasti <sreepurna.jasti@gmai
303325
Stanislav Opichal <[email protected]>
304326
Stefan Budeanu <[email protected]> <[email protected]>
305327
Stefan Bühler <[email protected]>
328+
Stephen Belanger <[email protected]> <[email protected]>
306329
Steve Mao <[email protected]> <[email protected]>
307330
Steven R. Loomis <[email protected]> <[email protected]>
308331
Stewart X Addison <[email protected]> Stewart Addison <[email protected]>
@@ -315,6 +338,7 @@ Taehee Kang <[email protected]> hugnosis <[email protected]>
315338
Tanuja-Sawant <[email protected]> <[email protected]>
316339
Taylor Woll <[email protected]> taylor.woll <[email protected]>
317340
Thomas Watson Steen <[email protected]> Thomas Watson <[email protected]>
341+
Timothy O. Peters <[email protected]>
318342
Timur Shemsedinov <[email protected]> tshemsedinov <[email protected]>
319343
Toby Farley <[email protected]> tobyfarley <[email protected]>
320344
Toby Stableford <[email protected]> toboid <[email protected]>
@@ -325,6 +349,7 @@ Tadashi SAWADA <[email protected]>
325349
Takahiro ANDO <[email protected]>
326350
Tarun Batra <[email protected]> Tarun <[email protected]>
327351
Ted Young <[email protected]>
352+
Thomas Hunter II <[email protected]> <[email protected]>
328353
Thomas Lee <[email protected]> <[email protected]>
329354
Thomas Reggi <[email protected]>
330355
Tierney Cyren <[email protected]> &! (bitandbang) <[email protected]>
@@ -334,21 +359,28 @@ Tim Price <[email protected]>
334359
Tim Smart <[email protected]> <[email protected]>
335360
Tim Smart <[email protected]> <[email protected]>
336361
Timothy Leverett <[email protected]> Timothy <[email protected]>
362+
Tobias Nießen <[email protected]> <[email protected]>
337363
Tom Hughes <[email protected]> <[email protected]>
338364
Tom Hughes-Croucher <[email protected]>
339365
Tom Purcell <[email protected]> tpurcell <[email protected]>
366+
Tom White <[email protected]>
340367
Tomoki Okahana <[email protected]> umatoma <[email protected]>
341368
Travis Meisenheimer <[email protected]> <[email protected]>
342369
Trevor Burnham <[email protected]> <[email protected]>
370+
Trivikram Kamat <[email protected]> <[email protected]>
343371
Tyler Larson <[email protected]>
344372
Viktor Karpov <[email protected]> vitkarpov <[email protected]>
345373
Vincent Voyer <[email protected]>
346374
Vladimir de Turckheim <[email protected]>
347375
vsemozhetbyt <[email protected]> Vse Mozhet Byt <[email protected]>
348376
Wang Xinyong <[email protected]> <[email protected]>
349377
Weijia Wang <[email protected]> starkwang <[email protected]>
378+
Wei-Wei Wu <[email protected]>
350379
Willi Eggeling <[email protected]>
380+
Will Hayslett <[email protected]>
381+
Wilson Lin <[email protected]>
351382
Wyatt Preul <[email protected]> geek <[email protected]>
383+
Xavier J Ortiz <[email protected]>
352384
xiaoyu <[email protected]> Poker <[email protected]>
353385
Yazhong Liu <[email protected]> Yazhong Liu <[email protected]>
354386
Yazhong Liu <[email protected]> Yorkie <[email protected]>
@@ -360,8 +392,10 @@ Yuichiro MASUI <[email protected]>
360392
Yuta Hiroto <[email protected]> abouthiroppy <[email protected]>
361393
Zach Bjornson <[email protected]> <[email protected]>
362394
Zachary Scott <[email protected]> <[email protected]>
395+
Zachary Vacura <[email protected]>
363396
Zoran Tomicic <[email protected]>
364397
Сковорода Никита Андреевич <[email protected]> ChALkeR <[email protected]>
398+
隋鑫磊 <[email protected]>
365399

366400
# These people didn't contribute patches to node directly,
367401
# but we've landed their v8 patches in the node repository:

‎AUTHORS‎

Lines changed: 79 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1546,7 +1546,7 @@ Weijia Wang <[email protected]>
15461546
Nataly Shrits <[email protected]>
15471547
Jaime Bernardo <[email protected]>
15481548
Natanael Log <[email protected]>
1549-
MoonBall <[email protected]>
1549+
Chen Gang <[email protected]>
15501550
kuroljov <[email protected]>
15511551
Matt Sergeant <[email protected]>
15521552
Eduardo Leggiero <[email protected]>
@@ -1886,7 +1886,7 @@ Damian <[email protected]>
18861886
Alec Perkins <[email protected]>
18871887
Teppei Sato <[email protected]>
18881888
Jinwoo Lee <[email protected]>
1889-
Peter Marton <peter@risingstack.com>
1889+
Peter Marton <email@martonpeter.com>
18901890
Erwin W. Ramadhan <[email protected]>
18911891
Mark Walker <[email protected]>
18921892
sharkfisher <[email protected]>
@@ -2031,7 +2031,7 @@ Junichi Kajiwara <[email protected]>
20312031
Matthew Leon <[email protected]>
20322032
Hativ <[email protected]>
20332033
Tom Hallam <[email protected]>
2034-
Hannes Magnusson <hannes.magnusson@creditkarma.com>
2034+
Hannes Magnusson <hannes.magnusson@gmail.com>
20352035
ChungNgoops <[email protected]>
20362036
Jose M. Palacios Diaz <[email protected]>
20372037
hmammedzadeh <[email protected]>
@@ -2059,10 +2059,85 @@ Jure Triglav <[email protected]>
20592059
alnyan <[email protected]>
20602060
rt33 <[email protected]>
20612061
Ulmanb <[email protected]>
2062-
xortiz <[email protected]>
2062+
Xavier J Ortiz <[email protected]>
20632063
Waleed Ashraf <[email protected]>
20642064
Mir Mufaqam Ali <[email protected]>
20652065
Nicholas Drane <[email protected]>
20662066
Shobhit Chittora <[email protected]>
2067+
Dmitriy Kasyanov <[email protected]>
2068+
Tyson Andre <[email protected]>
2069+
Salame William <[email protected]>
2070+
Todd Wong <[email protected]>
2071+
Mykola Bilochub <[email protected]>
2072+
Qingyan Li <[email protected]>
2073+
Sho Miyamoto <[email protected]>
2074+
现充 <[email protected]>
2075+
furstenheim <[email protected]>
2076+
Moritz Peters <[email protected]>
2077+
Nils Kuhnhenn <[email protected]>
2078+
隋鑫磊 <[email protected]>
2079+
Kostiantyn Wandalen <[email protected]>
2080+
Mars Wong <[email protected]>
2081+
Omar Crisostomo <[email protected]>
2082+
Leeseean Chiu <[email protected]>
2083+
Gilles De Mey <[email protected]>
2084+
Matthew Turner <[email protected]>
2085+
Ryan Mahan <[email protected]>
2086+
Antony Tran <[email protected]>
2087+
Robert Adamian <[email protected]>
2088+
Peter Dalgaard-Jensen <[email protected]>
2089+
Seth Brenith <[email protected]>
2090+
Adam Engebretson <[email protected]>
2091+
Aaron Kau <[email protected]>
2092+
Ivan Filenko <[email protected]>
2093+
Zachary Vacura <[email protected]>
2094+
Timothy O. Peters <[email protected]>
2095+
Ben Wilcox <[email protected]>
2096+
Justin Ridgewell <[email protected]>
2097+
Juan Sebastian Velez Posada <[email protected]>
2098+
Guangcong Luo <[email protected]>
2099+
Sarat Addepalli <[email protected]>
2100+
Nick Soggin <[email protected]>
2101+
Camilo Gonzalez <[email protected]>
2102+
BufoViridis <[email protected]>
2103+
Bhavani Shankar <[email protected]>
2104+
JiaHerr Tee <[email protected]>
2105+
Jeff Principe <[email protected]>
2106+
Alejandro Estrada <[email protected]>
2107+
Aonghus O Nia <[email protected]>
2108+
Mihail Bodrov <[email protected]>
2109+
Chin Huang <[email protected]>
2110+
Kevin Caulfield <[email protected]>
2111+
Sergey Golovin <[email protected]>
2112+
Miles Elam <[email protected]>
2113+
Ashutosh Kumar Singh <[email protected]>
2114+
killagu <[email protected]>
2115+
dustinnewman98 <[email protected]>
2116+
Oluwaseun Omoyajowo <[email protected]>
2117+
Wilson Lin <[email protected]>
2118+
Eric Bickle <[email protected]>
2119+
Ujjwal Sharma <[email protected]>
2120+
Wei-Wei Wu <[email protected]>
2121+
Prateek Singh <[email protected]>
2122+
Ken Lin <[email protected]>
2123+
Piotr Grzesik <[email protected]>
2124+
Damien Simonin Feugas <[email protected]>
2125+
Anton Salikhmetov <[email protected]>
2126+
Sameer Srivastava <[email protected]>
2127+
Joseph Leon <[email protected]>
2128+
Tom White <[email protected]>
2129+
Ari Leo Frankel <[email protected]>
2130+
jiangq <[email protected]>
2131+
Will Hayslett <[email protected]>
2132+
Wes Todd <[email protected]>
2133+
Nathaniel Weeks <[email protected]>
2134+
Ke Ding <[email protected]>
2135+
Ayush Gupta <[email protected]>
2136+
[email protected] <[email protected]>
2137+
Kenji Okamoto <[email protected]>
2138+
wangzengdi <[email protected]>
2139+
Garwah Lam <[email protected]>
2140+
jaspal-yupana <[email protected]>
2141+
Arian Santrach <[email protected]>
20672142

20682143
# Generated by tools/update-authors.sh

‎deps/npm/lib/shrinkwrap.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,4 +249,3 @@ function checkPackageFile (dir, name) {
249249
}
250250
}).catch({code: 'ENOENT'}, () => {})
251251
}
252-

‎deps/npm/node_modules/hosted-git-info/README.md‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎deps/npm/node_modules/node-gyp/CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎deps/npm/node_modules/node-gyp/gyp/gyp.bat‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎deps/npm/node_modules/node-gyp/gyp/pylib/gyp/easy_xml.py‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/eclipse.py‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎deps/npm/node_modules/node-gyp/gyp/pylib/gyp/ordered_dict.py‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎deps/npm/node_modules/node-gyp/gyp/samples/samples.bat‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)