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

Commit

Permalink
meta: merge node-chakracore/master into node-chakracore/chakracore-ma…
Browse files Browse the repository at this point in the history
…ster

Merge b3e69f3 as of 2018-04-08
This commit was automatically generated. For any problems, please contact jackhorton

Reviewed-By: chakrabot <[email protected]>
  • Loading branch information
chakrabot committed Apr 8, 2018
2 parents e8a8bd3 + b3e69f3 commit b9dcb28
Show file tree
Hide file tree
Showing 138 changed files with 3,134 additions and 1,215 deletions.
36 changes: 35 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ Aaron Heckmann <[email protected]> <[email protected]>
Aayush Ahuja <[email protected]> aayush.a <[email protected]>
Abe Fettig <[email protected]> <[email protected]>
Akito Ito <[email protected]> <[email protected]>
Alejandro Estrada <[email protected]>
Alejandro Estrada <[email protected]> <[email protected]>
Alejandro Oviedo Garcia <[email protected]> Alejandro Oviedo <[email protected]>
Alex Gilbert <[email protected]> agilbert <[email protected]>
Alex Hultman <[email protected]> <[email protected]>
Expand Down Expand Up @@ -30,6 +32,8 @@ Artur G Vieira <[email protected]> Artur Vieira <[email protected]
Arnout Kazemier <[email protected]> <[email protected]>
Asaf David <[email protected]> asafdav2 <[email protected]>
Ashley Maceli <[email protected]> ashleyraymaceli <[email protected]>
Ashok Suthar <[email protected]>
Ashutosh Kumar Singh <[email protected]>
Atsuo Fukaya <[email protected]>
Ben Lugavere <[email protected]> blugavere <[email protected]>
Ben Noordhuis <[email protected]> <bnoordhuis@bender.(none)>
Expand Down Expand Up @@ -59,15 +63,17 @@ Calvin Metcalf <[email protected]> <[email protected]>
Calvin Metcalf <[email protected]> <[email protected]>
Caralyn Reisle <[email protected]> creisle <[email protected]>
Charles <[email protected]> <[email protected]>
Chew Choon Keat <[email protected]>
Charles Rudolph <[email protected]>
Chen Gang <[email protected]>
Chew Choon Keat <[email protected]>
Chris Andrews <[email protected]> cpandrews8 <[email protected]>
Chris Johnson <[email protected]>
Chris Young <[email protected]> <[email protected]>
Claudio Rodriguez <[email protected]> <[email protected]>
Colin Ihrig <[email protected]>
Christophe Naud-Dulude <[email protected]> Chris911 <[email protected]>
Christopher Lenz <[email protected]> <[email protected]>
Damien Simonin Feugas <[email protected]>
Dan Kaplun <[email protected]> <[email protected]>
Dan Williams <[email protected]> Dan.Williams <[email protected]>
Daniel Abrão <[email protected]> Daniel Abrão <[email protected]>>
Expand Down Expand Up @@ -116,6 +122,7 @@ Friedemann Altrock <[email protected]>
Fuji Goro <[email protected]>
Gabriel de Perthuis <[email protected]>
Gareth Ellis <[email protected]> <[email protected]>
Garwah Lam <[email protected]>
Geoffrey Bugaisky <[email protected]> gbugaisky <[email protected]>
Gibson Fahnestock <[email protected]> <[email protected]>
Gil Pedersen <[email protected]> <[email protected]>
Expand All @@ -125,6 +132,7 @@ Gregor Martynus <[email protected]> Gregor <[email protected]>
Guy Bedford <[email protected]> guybedford <[email protected]>
Halil İbrahim Şener <[email protected]> hisener <[email protected]>
Hannah Kim <[email protected]> heeeunkimmm <[email protected]>
Hannes Magnusson <[email protected]> <[email protected]>
Hendrik Schwalm <[email protected]> hschwalm <[email protected]>
Hitesh Kanwathirtha <[email protected]> <[email protected]>
Henry Chin <[email protected]>
Expand Down Expand Up @@ -168,6 +176,7 @@ Jonathan Gourlay <[email protected]> mrgorbo <[email protected]>
Jonathan Ong <[email protected]> <[email protected]>
Jonathan Persson <[email protected]> <[email protected]>
Jonathan Rentzsch <[email protected]>
Joseph Leon <[email protected]>
Jose Luis Vivero <[email protected]> jlvivero <[email protected]>
Josh Erickson <[email protected]>
Josh Hunter <[email protected]> jopann <[email protected]>
Expand All @@ -180,21 +189,26 @@ Junliang Yan <[email protected]>
Junliang Yan <[email protected]> <[email protected]>
Junshu Okamoto <[email protected]> jun-oka <[email protected]>
Justin Beckwith <[email protected]> <[email protected]>
Justin Lee <[email protected]> <[email protected]>
Jérémy Lal <[email protected]>
Jérémy Lal <[email protected]> <[email protected]>
Juan Sebastian Velez Posada <[email protected]>
Kai Sasaki Lewuathe <[email protected]>
Karl Skomski <[email protected]> <[email protected]>
Kathy Truong <[email protected]> k3kathy <[email protected]>
Kazuyuki Yamada <[email protected]>
Keith M Wesolowski <[email protected]> <[email protected]>
Kelsey Breseman <[email protected]>
Ke Ding <[email protected]>
Khaidi Chu <[email protected]> XadillaX <[email protected]>
Khaidi Chu <[email protected]> <[email protected]>
Kiyoshi Nomo <[email protected]> kysnm <[email protected]>
Koichi Kobayashi <[email protected]>
Kostiantyn Wandalen <[email protected]>
Kris Kowal <[email protected]>
Kyle Robinson Young <[email protected]>
Lakshmi Swetha Gopireddy <[email protected]> LAKSHMI SWETHA GOPIREDDY <[email protected]>
Leeseean Chiu <[email protected]>
Luke Bayes <[email protected]>
Lydia Kats <[email protected]> Lydia Katsamberis <[email protected]>
Maciej Małecki <[email protected]> <[email protected]>
Expand All @@ -210,12 +224,14 @@ Marti Martz <[email protected]>
Martial James Jefferson <[email protected]>
Martijn Schrage <[email protected]> Oblosys <[email protected]>
Matheus Marchini <[email protected]> <[email protected]>
Matheus Marchini <[email protected]> <[email protected]>
Matt Lang <[email protected]> matt-in-a-hat <[email protected]>
Matt Reed <[email protected]> matthewreed26 <[email protected]>
Matthias Bastian <[email protected]> piepmatz <[email protected]>
Mathias Buus <[email protected]> <[email protected]>
Mathias Pettersson <[email protected]>
Matthew Lye <[email protected]>
Matthew Turner <[email protected]> <[email protected]>
Maurice Hayward <[email protected]> maurice_hayward <[email protected]>
Michael Bernstein <[email protected]>
Michael Dawson <[email protected]> <[email protected]>
Expand All @@ -237,17 +253,22 @@ Myles Borins <[email protected]> <[email protected]>
Nebu Pookins<[email protected]>
Netto Farah <[email protected]> nettofarah <[email protected]>
Nicholas Kinsey <[email protected]>
Nick Soggin <[email protected]> <[email protected]>
Nikolai Vavilov <[email protected]>
Nils Kuhnhenn <[email protected]>
Noah Rose Ledesma <[email protected]> Noah Rose <[email protected]>
Noah Rose Ledesma <[email protected]> <[email protected]>
Oluwaseun Omoyajowo <[email protected]>
Onne Gorter <[email protected]>
Paul Querna <[email protected]> <[email protected]>
Pedro Lima <[email protected]> Pedro Victor <[email protected]>
Pedro Lima <[email protected]> Pedro lima <[email protected]>
Peng Lyu <[email protected]> rebornix <[email protected]>
Peter Flannery <[email protected]>
Peter Marton <[email protected]> <[email protected]>
Peter Paugh <[email protected]> Peter <[email protected]>
Phillip Johnsen <[email protected]> <[email protected]>
Prateek Singh <[email protected]> <[email protected]>
Rachel White <[email protected]> rachelnicole <[email protected]>
Ratikesh Misra <[email protected]>
Ravindra Barthwal <[email protected]> Ravindra barthwal <[email protected]>
Expand All @@ -270,6 +291,7 @@ Ruben Bridgewater <[email protected]> <[email protected]>
Russell Dempsey <[email protected]> <[email protected]>
Ryan Dahl <[email protected]>
Ryan Emery <[email protected]>
Ryan Mahan <[email protected]>
Ryan Scheel <[email protected]> Ryan Scheel <[email protected]>
Ryan Scheel <[email protected]> Ryan Scheel (Havvy) <[email protected]>
Saad Quadri <[email protected]> saadq <[email protected]>
Expand Down Expand Up @@ -303,6 +325,7 @@ Sreepurna Jasti <[email protected]> sreepurnajasti <sreepurna.jasti@gmai
Stanislav Opichal <[email protected]>
Stefan Budeanu <[email protected]> <[email protected]>
Stefan Bühler <[email protected]>
Stephen Belanger <[email protected]> <[email protected]>
Steve Mao <[email protected]> <[email protected]>
Steven R. Loomis <[email protected]> <[email protected]>
Stewart X Addison <[email protected]> Stewart Addison <[email protected]>
Expand All @@ -315,6 +338,7 @@ Taehee Kang <[email protected]> hugnosis <[email protected]>
Tanuja-Sawant <[email protected]> <[email protected]>
Taylor Woll <[email protected]> taylor.woll <[email protected]>
Thomas Watson Steen <[email protected]> Thomas Watson <[email protected]>
Timothy O. Peters <[email protected]>
Timur Shemsedinov <[email protected]> tshemsedinov <[email protected]>
Toby Farley <[email protected]> tobyfarley <[email protected]>
Toby Stableford <[email protected]> toboid <[email protected]>
Expand All @@ -325,6 +349,7 @@ Tadashi SAWADA <[email protected]>
Takahiro ANDO <[email protected]>
Tarun Batra <[email protected]> Tarun <[email protected]>
Ted Young <[email protected]>
Thomas Hunter II <[email protected]> <[email protected]>
Thomas Lee <[email protected]> <[email protected]>
Thomas Reggi <[email protected]>
Tierney Cyren <[email protected]> &! (bitandbang) <[email protected]>
Expand All @@ -334,21 +359,28 @@ Tim Price <[email protected]>
Tim Smart <[email protected]> <[email protected]>
Tim Smart <[email protected]> <[email protected]>
Timothy Leverett <[email protected]> Timothy <[email protected]>
Tobias Nießen <[email protected]> <[email protected]>
Tom Hughes <[email protected]> <[email protected]>
Tom Hughes-Croucher <[email protected]>
Tom Purcell <[email protected]> tpurcell <[email protected]>
Tom White <[email protected]>
Tomoki Okahana <[email protected]> umatoma <[email protected]>
Travis Meisenheimer <[email protected]> <[email protected]>
Trevor Burnham <[email protected]> <[email protected]>
Trivikram Kamat <[email protected]> <[email protected]>
Tyler Larson <[email protected]>
Viktor Karpov <[email protected]> vitkarpov <[email protected]>
Vincent Voyer <[email protected]>
Vladimir de Turckheim <[email protected]>
vsemozhetbyt <[email protected]> Vse Mozhet Byt <[email protected]>
Wang Xinyong <[email protected]> <[email protected]>
Weijia Wang <[email protected]> starkwang <[email protected]>
Wei-Wei Wu <[email protected]>
Willi Eggeling <[email protected]>
Will Hayslett <[email protected]>
Wilson Lin <[email protected]>
Wyatt Preul <[email protected]> geek <[email protected]>
Xavier J Ortiz <[email protected]>
xiaoyu <[email protected]> Poker <[email protected]>
Yazhong Liu <[email protected]> Yazhong Liu <[email protected]>
Yazhong Liu <[email protected]> Yorkie <[email protected]>
Expand All @@ -360,8 +392,10 @@ Yuichiro MASUI <[email protected]>
Yuta Hiroto <[email protected]> abouthiroppy <[email protected]>
Zach Bjornson <[email protected]> <[email protected]>
Zachary Scott <[email protected]> <[email protected]>
Zachary Vacura <[email protected]>
Zoran Tomicic <[email protected]>
Сковорода Никита Андреевич <[email protected]> ChALkeR <[email protected]>
隋鑫磊 <[email protected]>

# These people didn't contribute patches to node directly,
# but we've landed their v8 patches in the node repository:
Expand Down
83 changes: 79 additions & 4 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -1546,7 +1546,7 @@ Weijia Wang <[email protected]>
Nataly Shrits <[email protected]>
Jaime Bernardo <[email protected]>
Natanael Log <[email protected]>
MoonBall <[email protected]>
Chen Gang <[email protected]>
kuroljov <[email protected]>
Matt Sergeant <[email protected]>
Eduardo Leggiero <[email protected]>
Expand Down Expand Up @@ -1886,7 +1886,7 @@ Damian <[email protected]>
Alec Perkins <[email protected]>
Teppei Sato <[email protected]>
Jinwoo Lee <[email protected]>
Peter Marton <peter@risingstack.com>
Peter Marton <email@martonpeter.com>
Erwin W. Ramadhan <[email protected]>
Mark Walker <[email protected]>
sharkfisher <[email protected]>
Expand Down Expand Up @@ -2031,7 +2031,7 @@ Junichi Kajiwara <[email protected]>
Matthew Leon <[email protected]>
Hativ <[email protected]>
Tom Hallam <[email protected]>
Hannes Magnusson <hannes.magnusson@creditkarma.com>
Hannes Magnusson <hannes.magnusson@gmail.com>
ChungNgoops <[email protected]>
Jose M. Palacios Diaz <[email protected]>
hmammedzadeh <[email protected]>
Expand Down Expand Up @@ -2059,10 +2059,85 @@ Jure Triglav <[email protected]>
alnyan <[email protected]>
rt33 <[email protected]>
Ulmanb <[email protected]>
xortiz <[email protected]>
Xavier J Ortiz <[email protected]>
Waleed Ashraf <[email protected]>
Mir Mufaqam Ali <[email protected]>
Nicholas Drane <[email protected]>
Shobhit Chittora <[email protected]>
Dmitriy Kasyanov <[email protected]>
Tyson Andre <[email protected]>
Salame William <[email protected]>
Todd Wong <[email protected]>
Mykola Bilochub <[email protected]>
Qingyan Li <[email protected]>
Sho Miyamoto <[email protected]>
现充 <[email protected]>
furstenheim <[email protected]>
Moritz Peters <[email protected]>
Nils Kuhnhenn <[email protected]>
隋鑫磊 <[email protected]>
Kostiantyn Wandalen <[email protected]>
Mars Wong <[email protected]>
Omar Crisostomo <[email protected]>
Leeseean Chiu <[email protected]>
Gilles De Mey <[email protected]>
Matthew Turner <[email protected]>
Ryan Mahan <[email protected]>
Antony Tran <[email protected]>
Robert Adamian <[email protected]>
Peter Dalgaard-Jensen <[email protected]>
Seth Brenith <[email protected]>
Adam Engebretson <[email protected]>
Aaron Kau <[email protected]>
Ivan Filenko <[email protected]>
Zachary Vacura <[email protected]>
Timothy O. Peters <[email protected]>
Ben Wilcox <[email protected]>
Justin Ridgewell <[email protected]>
Juan Sebastian Velez Posada <[email protected]>
Guangcong Luo <[email protected]>
Sarat Addepalli <[email protected]>
Nick Soggin <[email protected]>
Camilo Gonzalez <[email protected]>
BufoViridis <[email protected]>
Bhavani Shankar <[email protected]>
JiaHerr Tee <[email protected]>
Jeff Principe <[email protected]>
Alejandro Estrada <[email protected]>
Aonghus O Nia <[email protected]>
Mihail Bodrov <[email protected]>
Chin Huang <[email protected]>
Kevin Caulfield <[email protected]>
Sergey Golovin <[email protected]>
Miles Elam <[email protected]>
Ashutosh Kumar Singh <[email protected]>
killagu <[email protected]>
dustinnewman98 <[email protected]>
Oluwaseun Omoyajowo <[email protected]>
Wilson Lin <[email protected]>
Eric Bickle <[email protected]>
Ujjwal Sharma <[email protected]>
Wei-Wei Wu <[email protected]>
Prateek Singh <[email protected]>
Ken Lin <[email protected]>
Piotr Grzesik <[email protected]>
Damien Simonin Feugas <[email protected]>
Anton Salikhmetov <[email protected]>
Sameer Srivastava <[email protected]>
Joseph Leon <[email protected]>
Tom White <[email protected]>
Ari Leo Frankel <[email protected]>
jiangq <[email protected]>
Will Hayslett <[email protected]>
Wes Todd <[email protected]>
Nathaniel Weeks <[email protected]>
Ke Ding <[email protected]>
Ayush Gupta <[email protected]>
[email protected] <[email protected]>
Kenji Okamoto <[email protected]>
wangzengdi <[email protected]>
Garwah Lam <[email protected]>
jaspal-yupana <[email protected]>
Arian Santrach <[email protected]>

# Generated by tools/update-authors.sh
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ release.
</tr>
<tr>
<td valign="top">
<b><a href="doc/changelogs/CHANGELOG_V9.md#9.10.1">9.10.1</a></b><br/>
<b><a href="doc/changelogs/CHANGELOG_V9.md#9.11.1">9.11.1</a></b><br/>
<a href="doc/changelogs/CHANGELOG_V9.md#9.11.0">9.11.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V9.md#9.10.1">9.10.1</a><br/>
<a href="doc/changelogs/CHANGELOG_V9.md#9.10.0">9.10.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V9.md#9.9.0">9.9.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V9.md#9.8.0">9.8.0</a><br/>
Expand Down
2 changes: 1 addition & 1 deletion deps/chakrashim/lib/chakra_shim.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
};

StackFrame.prototype.getTypeName = function() {
//TODO : Fix this
// TODO : Fix this
return this.functionName;
};

Expand Down
1 change: 0 additions & 1 deletion deps/npm/lib/shrinkwrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -249,4 +249,3 @@ function checkPackageFile (dir, name) {
}
}).catch({code: 'ENOENT'}, () => {})
}

1 change: 0 additions & 1 deletion deps/npm/node_modules/hosted-git-info/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion deps/npm/node_modules/node-gyp/CHANGELOG.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions deps/npm/node_modules/node-gyp/gyp/gyp.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion deps/npm/node_modules/node-gyp/gyp/pylib/gyp/easy_xml.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions deps/npm/node_modules/node-gyp/gyp/samples/samples.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b9dcb28

Please sign in to comment.