Skip to content

Commit

Permalink
Merge branch 'ssm' into ssm
Browse files Browse the repository at this point in the history
  • Loading branch information
n-thumann authored Oct 16, 2019
2 parents 6e9d7c8 + b049b3a commit 4807062
Show file tree
Hide file tree
Showing 7,812 changed files with 499,449 additions and 241,978 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -317,5 +317,6 @@ module.exports = {
TextEncoder: 'readable',
TextDecoder: 'readable',
queueMicrotask: 'readable',
globalThis: 'readable',
},
};
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
test/fixtures/* -text
vcbuild.bat text eol=crlf
tools/msvs/find_python.cmd text eol=crlf
28 changes: 28 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,31 @@ Contributors guide: https://github.com/nodejs/node/blob/master/CONTRIBUTING.md
- [ ] tests and/or benchmarks are included
- [ ] documentation is changed or added
- [ ] commit message follows [commit guidelines](https://github.com/nodejs/node/blob/master/doc/guides/contributing/pull-requests.md#commit-message-guidelines)

<!--
Developer's Certificate of Origin 1.1
By making a contribution to this project, I certify that:
(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file; or
(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license (unless I am
permitted to submit under a different license), as indicated
in the file; or
(c) The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified
it.
(d) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.
-->
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ _UpgradeReport_Files/
# coverage related
/gcovr
/build
/coverage

# === Rules for XCode artifacts ===
*.xcodeproj
Expand All @@ -130,3 +131,4 @@ _UpgradeReport_Files/
*.pyc
__pycache__
.DS_Store
*~
15 changes: 12 additions & 3 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Andreas Offenhaeuser <[email protected]> anoff <[email protected]>
Andy Bettisworth <[email protected]>
Angel Stoyanov <[email protected]> atstojanov <[email protected]>
Anna Henningsen <[email protected]> <[email protected]>
Anna Henningsen <[email protected]> <[email protected]>
Anna Magdalena Kedzierska <[email protected]> AnnaMag <[email protected]>
Antoine Amara <[email protected]> Antoine AMARA <[email protected]>
Aria Stewart <[email protected]> <[email protected]>
Expand All @@ -44,8 +45,10 @@ Ben Noordhuis <[email protected]> <bnoordhuis@bender.(none)>
Ben Noordhuis <[email protected]> <[email protected]>
Ben Taber <[email protected]>
Benjamin Coe <[email protected]> <[email protected]>
Benjamin Coe <[email protected]> <[email protected]>
Benjamin Fleischer <[email protected]> Benjamin Fleischer <[email protected]>
Benjamin Gruenbaum <[email protected]> <[email protected]>
Benjamin Gruenbaum <[email protected]> <[email protected]>
Benjamin Gruenbaum <[email protected]> <[email protected]>
Benjamin Waters <[email protected]> <[email protected]>
Bert Belder <[email protected]> <bert@piscisaureus2.(none)>
Bert Belder <[email protected]> <[email protected]>
Expand Down Expand Up @@ -158,6 +161,7 @@ Imran Iqbal <[email protected]> <[email protected]>
Ionică Bizău <[email protected]> <[email protected]>
Isaac Z. Schlueter <[email protected]>
Isaac Z. Schlueter <[email protected]> <[email protected]>
Isaac Z. Schlueter <[email protected]> isaacs <[email protected]>
Isuru Siriwardana <[email protected]> isurusiri <[email protected]>
Italo A. Casas <[email protected]> <[email protected]>
Jackson Tian <[email protected]> <[email protected]>
Expand Down Expand Up @@ -218,6 +222,8 @@ Kelsey Breseman <[email protected]>
Ke Ding <[email protected]>
Khaidi Chu <[email protected]> XadillaX <[email protected]>
Khaidi Chu <[email protected]> <[email protected]>
Kimberly Wilber <[email protected]>
Kimberly Wilber <[email protected]> <[email protected]>
Kiyoshi Nomo <[email protected]> kysnm <[email protected]>
Koichi Kobayashi <[email protected]>
Kostiantyn Wandalen <[email protected]>
Expand Down Expand Up @@ -255,7 +261,6 @@ Matthew Turner <[email protected]> <[email protected]>
Maurice Hayward <[email protected]> maurice_hayward <[email protected]>
Michael Bernstein <[email protected]>
Michael Dawson <[email protected]> <[email protected]>
Michael Wilber <[email protected]>
Michaël Zasso <[email protected]> <[email protected]>
Michael-Rainabba Richardson <[email protected]> rainabba <[email protected]>
Michał Gołębiowski-Owczarek <[email protected]>
Expand Down Expand Up @@ -303,6 +308,7 @@ Ricardo Sánchez Gregorio <[email protected]> richnologies <[email protected]>
Rick Olson <[email protected]>
Rob Adelmann <[email protected]> <[email protected]>
Rob Adelmann <[email protected]> adelmann <[email protected]>
Robert Nagy <[email protected]> Robert Nagy <[email protected]>
Rod Machen <[email protected]> <[email protected]>
Roman Klauke <[email protected]> <[email protected]>
Roman Reiss <[email protected]>
Expand All @@ -322,12 +328,14 @@ Sam Mikes <[email protected]>
Sam P Gallagher-Bishop <[email protected]> <[email protected]>
Sam Shull <[email protected]> <[email protected]>
Sam Shull <[email protected]> <[email protected]>
Sambasiva Suda <[email protected]>
Sam Roberts <[email protected]> <[email protected]>
Samantha Sample <[email protected]> = <=>
Sambasiva Suda <[email protected]>
San-Tai Hsu <[email protected]>
Santiago Gimeno <[email protected]> <[email protected]>
Sarah Meyer <[email protected]> sarahmeyer <[email protected]>
Sartrey Lee <[email protected]> sartrey <[email protected]>
Saúl Ibarra Corretgé <[email protected]> <[email protected]>
Scott Blomquist <[email protected]> <[email protected]>
Segu Riluvan <[email protected]> <[email protected]>
Sergey Kryzhanovsky <[email protected]> <[email protected]>
Expand Down Expand Up @@ -417,6 +425,7 @@ Yazhong Liu <[email protected]> Yorkie Liu <[email protected]>
Yingchen Xue <[email protected]>
Yongsheng Zhang <[email protected]>
Yongsheng Zhang <[email protected]> <[email protected]>
Yongsheng Zhang <[email protected]> <[email protected]>
Yoshihiro KIKUCHI <[email protected]>
Yosuke Furukawa <[email protected]> <[email protected]>
Yuichiro MASUI <[email protected]>
Expand Down
22 changes: 14 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,14 @@ x-ccache-setup-steps: &ccache-setup-steps
- export CXX='ccache g++-6'

os: linux
dist: xenial
language: cpp
# Currently this file can only support one PYTHON_VERSION.
# To experiment with Python 3, comment out Python 2.7 and uncomment one of the Python 3 versions.
env:
global:
- PYTHON_VERSION="2.7.15"
# - PYTHON_VERSION="3.6.7"
# - PYTHON_VERSION="3.7.1"
jobs:
include:
- stage: "Compile"
Expand All @@ -20,7 +26,7 @@ jobs:
- g++-6
install: *ccache-setup-steps
script:
- pyenv global 2.7.15
- pyenv global ${PYTHON_VERSION}
- ./configure
- make -j2 -C out V=1 v8

Expand All @@ -34,7 +40,7 @@ jobs:
- g++-6
install: *ccache-setup-steps
script:
- pyenv global 2.7.15
- pyenv global ${PYTHON_VERSION}
- ./configure
- make -j2 V=1
- cp out/Release/node /home/travis/.ccache
Expand All @@ -47,7 +53,7 @@ jobs:
- mkdir -p out/Release
- cp /home/travis/.ccache/node out/Release/node
script:
- pyenv global 2.7.15
- pyenv global ${PYTHON_VERSION}
- python tools/test.py -j 2 -p dots --report --mode=release --flaky-tests=dontcare default

- name: "Test C++ Suites"
Expand All @@ -63,19 +69,19 @@ jobs:
- cp /home/travis/.ccache/cctest out/Release/cctest
- touch config.gypi
script:
- pyenv global 2.7.15
- pyenv global ${PYTHON_VERSION}
- out/Release/cctest
- make -j1 V=1 test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp
- python tools/test.py -j 2 -p dots --report --mode=release --flaky-tests=dontcare addons js-native-api node-api

- name: "Linter"
- name: "Run Linter and Build Docs"
language: node_js
node_js: "node"
install:
- pyenv global 2.7.15
- pyenv global ${PYTHON_VERSION}
- make lint-py-build || true
script:
- NODE=$(which node) make lint lint-py
- NODE=$(which node) make lint-py doc-only lint

- name: "First commit message adheres to guidelines at <a href=\"https://goo.gl/p2fr5Q\">https://goo.gl/p2fr5Q</a>"
if: type = pull_request
Expand Down
170 changes: 167 additions & 3 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ Daniel Gröber <[email protected]>
Travis Swicegood <[email protected]>
Oleg Slobodskoi <[email protected]>
Jeremy Martin <[email protected]>
Michael Wilber <[email protected]>
Kimberly Wilber <[email protected]>
Sean Braithwaite <[email protected]>
Anders Conbere <[email protected]>
Devin Torres <[email protected]>
Expand Down Expand Up @@ -538,7 +538,7 @@ Anton Khlynovskiy <[email protected]>
Nicolas Talle <[email protected]>
Mike Pennisi <[email protected]>
Maxwell Krohn <[email protected]>
Saúl Ibarra Corretgé <[email protected]>
Saúl Ibarra Corretgé <[email protected]>
Greg Brail <[email protected]>
Shuhei Kagawa <[email protected]>
Josh Dague <[email protected]>
Expand Down Expand Up @@ -707,7 +707,7 @@ Bruno Jouhier <[email protected]>
René Kooi <[email protected]>
Petka Antonov <[email protected]>
Ryan Scheel <[email protected]>
Benjamin Gruenbaum <inglor@gmail.com>
Benjamin Gruenbaum <benjamingr@gmail.com>
Pavel Medvedev <[email protected]>
Russell Dempsey <[email protected]>
Tierney Cyren <[email protected]>
Expand Down Expand Up @@ -2683,5 +2683,169 @@ Michael Wei <[email protected]>
Alexander Sattelmaier <[email protected]>
Avi ד <[email protected]>
Thomas <[email protected]>
Aymen Naghmouchi <[email protected]>
himself65 <[email protected]>
Geir Hauge <[email protected]>
Patrick Gansterer <[email protected]>
Nicolas Moteau <[email protected]>
Anthony Tuininga <[email protected]>
Yann Hamon <[email protected]>
Ben Swinburne <[email protected]>
Colin Prince <[email protected]>
TJKoury <[email protected]>
dnlup <[email protected]>
Hang Jiang <[email protected]>
Vladislav Kaminsky <[email protected]>
Daiki Ihara <[email protected]>
toshi1127 <[email protected]>
nd-02110114 <[email protected]>
dkundel <[email protected]>
Evan Plaice <[email protected]>
simon3000 <[email protected]>
Marcos Casagrande <[email protected]>
Ruwan Geeganage <[email protected]>
Maël Nison <[email protected]>
Gerson Niño <[email protected]>
freestraws <[email protected]>
Daniel Beckert <[email protected]>
Rivaldo Junior <[email protected]>
Rongjian Zhang <[email protected]>
tonyhty <[email protected]>
jyjunyz <[email protected]>
tongshouyu <[email protected]>
lixin.atom <[email protected]>
luoyu <[email protected]>
xinyulee <[email protected]>
hardfist <[email protected]>
shenchen <[email protected]>
zhoujiamin <[email protected]>
Chenxi Yuan <[email protected]>
nilianzhu <[email protected]>
wuchenkai <[email protected]>
xuqinggang <[email protected]>
XGHeaven <[email protected]>
sinoon <[email protected]>
Yaphet Ye <[email protected]>
OneNail <[email protected]>
陈健 <[email protected]>
heben <[email protected]>
sujunfei <[email protected]>
imhype <[email protected]>
ptaylor <[email protected]>
Boxuan Li <[email protected]>
Aditya Pratap Singh <[email protected]>
Eugene Ostroukhov <[email protected]>
Preveen Padmanabhan <[email protected]>
Benjamin Ki <[email protected]>
Daniel Nalborczyk <[email protected]>
Alba Mendez <[email protected]>
zero1five <[email protected]>
Gaelan <[email protected]>
Jacob <[email protected]>
himself65 <[email protected]>
Dan Beglin <[email protected]>
Anish Asrani <[email protected]>
teams2ua <[email protected]>
oksana <[email protected]>
Grigorii K. Shartsev <[email protected]>
Kopachyov Vitaliy <[email protected]>
MurkyMeow <[email protected]>
Evgenii Shchepotev <[email protected]>
martyns0n <[email protected]>
Levin Eugene <[email protected]>
Alexander Avakov <[email protected]>
Grigory Gorshkov <[email protected]>
Keroosha <[email protected]>
Tariq Ramlall <[email protected]>
Alex Pry <[email protected]>
Yuriy Vasiyarov <[email protected]>
Mikhail Kuklin <[email protected]>
went.out <[email protected]>
Kyle Zhang <[email protected]>
Alex Temny <[email protected]>
Alex Aubuchon <[email protected]>
Samuel Attard <[email protected]>
rexagod <[email protected]>
Antonio Kukas <[email protected]>
murgatroid99 <[email protected]>
Saagar Jha <[email protected]>
vmarchaud <[email protected]>
Milad Farazmand <[email protected]>
mutao <[email protected]>
Samantha Sample <[email protected]>
nicolasrestrepo <[email protected]>
Angie M. Delgado <[email protected]>
Alex Ramirez <[email protected]>
Duvan Monsalve <[email protected]>
Luis Gallon <[email protected]>
kball <[email protected]>
MistyBlunch <[email protected]>
Laura Ciro <[email protected]>
Yomar <[email protected]>
raveneyex <[email protected]>
khriztianmoreno <[email protected]>
David Sánchez <[email protected]>
melinamejia95 <[email protected]>
David Carlier <[email protected]>
Benoît Zugmeyer <[email protected]>
Julian Correa <[email protected]>
Felipe <[email protected]>
Juan Roa <[email protected]>
Ivan Villa <[email protected]>
Caleb ツ Everett <[email protected]>
Miken <[email protected]>
Eugene Ostroukhov <[email protected]>
Gabriela Niño <[email protected]>
Mike MacCana <[email protected]>
Tim Baverstock <[email protected]>
Walle Cyril <[email protected]>
Xu Meng <[email protected]>
Samuel Attard <[email protected]>
Ben L. Titzer <[email protected]>
Ojasvi Monga <[email protected]>
Shajan Jacob <[email protected]>
Austin Wright <[email protected]>
Vickodev <[email protected]>
Karen He <[email protected]>
Harshitha KP <[email protected]>
Tanner Stirrat <[email protected]>
h3knix <[email protected]>
Cotton Hou <[email protected]>
Edward Vielmetti <[email protected]>
Micha Hanselmann <[email protected]>
Luca Lindhorst <[email protected]>
Manuel Ochoa Loaiza <[email protected]>
Juan Bedoya <[email protected]>
Andres Bedoya <[email protected]>
elyalvarado <[email protected]>
Felipe Duitama <[email protected]>
Alejandro Nanez <[email protected]>
Jeroen Ooms <[email protected]>
PaulBags <[email protected]>
EduardoRFS <[email protected]>
Natalie Fearnley <[email protected]>
pi1024e <[email protected]>
Giorgos Ntemiris <[email protected]>
Rainer Poisel <[email protected]>
Andrew Hughes <[email protected]>
Tony Brix <[email protected]>
Anas Aboureada <[email protected]>
MattIPv4 <[email protected]>
David Guttman <[email protected]>
Xavier Stouder <[email protected]>
ran <[email protected]>
Nick Schonning <[email protected]>
Chetan Karande <[email protected]>
Bradley Farias <[email protected]>
Nimit Aggarwal <[email protected]>
Devendra Satram <[email protected]>
AtticusYang <[email protected]>
Kamil Rytarowski <[email protected]>
Aditya <[email protected]>
Denis Zavershinskiy <[email protected]>
Levhita <[email protected]>
claudiahdz <[email protected]>
Geoffrey Booth <[email protected]>
Javier Ledezma <[email protected]>

# Generated by tools/update-authors.js
Loading

0 comments on commit 4807062

Please sign in to comment.