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

Commit

Permalink
Merge branch 'nodejs/master' into chakracore-master
Browse files Browse the repository at this point in the history
Sync to nodejs/master (2016-04-27)

PR-URL: #66
Reviewed-By: Kunal Pathak <[email protected]>
  • Loading branch information
Jianchun Xu committed May 2, 2016
2 parents 2a8b3b0 + 3cdb506 commit 007b8f6
Show file tree
Hide file tree
Showing 1,572 changed files with 95,607 additions and 68,739 deletions.
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
lib/internal/v8_prof_polyfill.js
lib/internal/v8_prof_processor.js
lib/punycode.js
test/addons/??_*/
test/fixtures
Expand Down
6 changes: 4 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ rules:
no-duplicate-case: 2
no-empty-character-class: 2
no-ex-assign: 2
no-extra-boolean-cast : 2
no-extra-boolean-cast: 2
no-extra-parens: [2, "functions"]
no-extra-semi: 2
no-func-assign: 2
Expand Down Expand Up @@ -85,8 +85,10 @@ rules:
prefer-const: 2

# Custom rules in tools/eslint-rules
align-multiline-assignment: 2
assert-fail-single-argument: 2
new-with-error: [2, "Error", "RangeError", "TypeError", "SyntaxError", "ReferenceError"]

no-deepEqual: 2

# Global scoped method and vars
globals:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ _UpgradeReport_Files/
ipch/
*.sdf
*.opensdf
/.vs
*.VC.opendb
.vs/

/config.mk
/config.gypi
Expand Down
123 changes: 120 additions & 3 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ Steve Sharp <[email protected]>
Victor Widell <[email protected]>
Evan Rutledge Borden <[email protected]>
Johnny Ray <http://johnnyray.me>
Steve Mao <maochenyan@msn.com>
Steve Mao <maochenyan@gmail.com>
Stiliyan Lazarov <[email protected]>
Wang Xinyong <[email protected]>
Ray Donnelly <[email protected]>
Expand Down Expand Up @@ -782,7 +782,7 @@ Chad Johnston <[email protected]>
Sam Stites <[email protected]>
Matthew Lye <[email protected]>
Matt Loring <[email protected]>
P.S.V.R <[email protected]>
Minqi Pan <[email protected]>
Jacob Edelman <[email protected]>
Mike Atkins <[email protected]>
hackerjs <[email protected]>
Expand Down Expand Up @@ -831,7 +831,7 @@ Claudio Rodriguez <[email protected]>
Ido Ben-Yair <[email protected]>
Kyle Smith <[email protected]>
Marti Martz <[email protected]>
Stefan Budeanu <stefan@budeanu.com>
Stefan Budeanu <[email protected].com>
Emily Aviva Kapor-Mater <[email protected]>
Sam P Gallagher-Bishop <[email protected]>
David Woods <[email protected]>
Expand Down Expand Up @@ -868,5 +868,122 @@ Super Zheng <[email protected]>
Rafał Pocztarski <[email protected]>
Michael Ruddy <[email protected]>
Andy Bettisworth <[email protected]>
Jörg Krause <[email protected]>
Alexander Martin <[email protected]>
Prince J Wesley <[email protected]>
janriemer <[email protected]>
Arthur Gautier <[email protected]>
Martin von Gagern <[email protected]>
Hideki Yamamura <[email protected]>
Lenny Markus <[email protected]>
Nelson Pecora <[email protected]>
Graham Fairweather <[email protected]>
Nicholas Young <[email protected]>
chrisjohn404 <[email protected]>
Bo Borgerson <[email protected]>
Mudit Ameta <[email protected]>
Adri Van Houdt <[email protected]>
Max Barinov <[email protected]>
Damian Schenkelman <[email protected]>
iamchenxin <[email protected]>
Nik Nyby <[email protected]>
Ben Ripkens <[email protected]>
Ryan Sobol <[email protected]>
jona <[email protected]>
Martin Bark <[email protected]>
José F. Romaniello <[email protected]>
Richard Sun <[email protected]>
Sequoia McDowell <[email protected]>
zoubin <[email protected]>
Robert Jefe Lindstaedt <[email protected]>
Saquib <[email protected]>
Daniel Sellers <[email protected]>
Julien Waechter <[email protected]>
Vitor Cortez <[email protected]>
Michael Theriot <[email protected]>
Peter Geiss <[email protected]>
Richard Lau <[email protected]>
José Moreira <[email protected]>
Tom Atkinson <[email protected]>
Glen Arrowsmith <[email protected]>
Jeff Harris <[email protected]>
Alexander Makarenko <[email protected]>
Drew Folta <[email protected]>
Myles Borins <[email protected]>
Dmitriy Lazarev <[email protected]>
Adam Langley <[email protected]>
Kári Tristan Helgason <[email protected]>
Manuel Valls <[email protected]>
Prayag Verma <[email protected]>
Gibson Fahnestock <[email protected]>
Alan Cohen <[email protected]>
Christophe Naud-Dulude <[email protected]>
Matthias Bastian <[email protected]>
Phillip Kovalev <[email protected]>
Rainer Oviir <[email protected]>
HUANG Wei <[email protected]>
DC <[email protected]>
Daniel Turing <[email protected]>
Julie Pagano <[email protected]>
Ruben Bridgewater <[email protected]>
Felix Becker <[email protected]>
Igor Klopov <[email protected]>
Tsarevich Dmitry <[email protected]>
Ojas Shirekar <[email protected]>
Noah Rose <[email protected]>
Rafael Cepeda <[email protected]>
Chinedu Francis Nwafili <[email protected]>
Braydon Fuller <[email protected]>
Jiho Choi <[email protected]>
Dirceu Pereira Tiegs <[email protected]>
Marc Cuva <[email protected]>
Chris Dew <[email protected]>
Tristan Slominski <[email protected]>
Hugo Wood <[email protected]>
Owen Smith <[email protected]>
Anton Andesen <[email protected]>
Aayush Naik <[email protected]>
Netto Farah <[email protected]>
Craig Akimoto <[email protected]>
Michael Barrett <[email protected]>
Alexander Marchenko <[email protected]>
Robert C Jensen <[email protected]>
Vaibhav <[email protected]>
Stefano Vozza <[email protected]>
Daijiro Wachi <[email protected]>
Kirill Fomichev <[email protected]>
Mithun Patel <[email protected]>
Alexander Penev <[email protected]>
Andrea Giammarchi <[email protected]>
Lance Ball <[email protected]>
Jarrett Widman <[email protected]>
Florian Margaine <[email protected]>
Wolfgang Steiner <[email protected]>
Bill Automata <[email protected]>
Robert Chiras <[email protected]>
Corey Kosak <[email protected]>
John Eversole <[email protected]>
Gareth Ellis <[email protected]>
Eugene Obrezkov <[email protected]>
Kyle Simpson <[email protected]>
Bogdan Lobor <[email protected]>
Daniel Wang <[email protected]>
Mihai Potra <[email protected]>
Brendon Pierson <[email protected]>
Brad Hill <[email protected]>
Mike Kaufman <[email protected]>
Igor Kalashnikov <[email protected]>
Anna Henningsen <[email protected]>
Amery <[email protected]>
James Reggio <[email protected]>
Joran Dirk Greef <[email protected]>
Matthew Douglass <[email protected]>
William Kapke <[email protected]>
Yuta Hiroto <[email protected]>
Ilya Shaisultanov <[email protected]>
James Lal <[email protected]>
Josh Leder <[email protected]>
surya panikkal <[email protected]>
vsemozhetbyt <[email protected]>

# Generated by tools/update-authors.sh
Loading

0 comments on commit 007b8f6

Please sign in to comment.