Skip to content

Commit 330f986

Browse files
authored
Merge branch 'nodejs:master' into test-test-runner-coverage
2 parents 711186b + b008e96 commit 330f986

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,6 @@ For information about the governance of the Node.js project, see
180180
**Matteo Collina** <<matteo.collina@gmail.com>> (he/him)
181181
* [mhdawson](https://github.com/mhdawson) -
182182
**Michael Dawson** <<midawson@redhat.com>> (he/him)
183-
* [mmarchini](https://github.com/mmarchini) -
184-
**Mary Marchini** <<oss@mmarchini.me>> (she/her)
185183
* [MylesBorins](https://github.com/MylesBorins) -
186184
**Myles Borins** <<myles.borins@gmail.com>> (he/him)
187185
* [RaisinTen](https://github.com/RaisinTen) -
@@ -227,6 +225,8 @@ For information about the governance of the Node.js project, see
227225
**Isaac Z. Schlueter** <<i@izs.me>>
228226
* [joshgav](https://github.com/joshgav) -
229227
**Josh Gavant** <<josh.gavant@outlook.com>>
228+
* [mmarchini](https://github.com/mmarchini) -
229+
**Mary Marchini** <<oss@mmarchini.me>> (she/her)
230230
* [mscdex](https://github.com/mscdex) -
231231
**Brian White** <<mscdex@mscdex.net>>
232232
* [nebrius](https://github.com/nebrius) -
@@ -380,8 +380,6 @@ For information about the governance of the Node.js project, see
380380
**Milad Fa** <<mfarazma@redhat.com>> (he/him)
381381
* [mildsunrise](https://github.com/mildsunrise) -
382382
**Alba Mendez** <<me@alba.sh>> (she/her)
383-
* [mmarchini](https://github.com/mmarchini) -
384-
**Mary Marchini** <<oss@mmarchini.me>> (she/her)
385383
* [mscdex](https://github.com/mscdex) -
386384
**Brian White** <<mscdex@mscdex.net>>
387385
* [MylesBorins](https://github.com/MylesBorins) -
@@ -552,6 +550,8 @@ For information about the governance of the Node.js project, see
552550
**Mikeal Rogers** <<mikeal.rogers@gmail.com>>
553551
* [misterdjules](https://github.com/misterdjules) -
554552
**Julien Gilli** <<jgilli@netflix.com>>
553+
* [mmarchini](https://github.com/mmarchini) -
554+
**Mary Marchini** <<oss@mmarchini.me>> (she/her)
555555
* [monsanto](https://github.com/monsanto) -
556556
**Christopher Monsanto** <<chris@monsan.to>>
557557
* [MoonBall](https://github.com/MoonBall) -

doc/contributing/diagnostic-tooling-support-tiers.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ The tools are currently assigned to Tiers as follows:
125125
| Tool Type | Tool/API Name | Regular Testing in Node.js CI | Integrated with Node.js | Target Tier |
126126
| --------- | ------------------------- | ----------------------------- | ----------------------- | ----------- |
127127
| FFDC | node-report | No | No | 1 |
128-
| Memory | mdb\_V8 | No | No | 4 |
129128
| Memory | node-heapdump | No | No | 2 |
130129
| Memory | V8 heap profiler | No | Yes | 1 |
131130
| Memory | V8 sampling heap profiler | No | Yes | 1 |

doc/contributing/strategic-initiatives.md

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@ agenda to ensure they are active and have the support they need.
66

77
## Current initiatives
88

9-
| Initiative | Champion | Links |
10-
| ------------------------- | --------------------------- | -------------------------------------------------------------------------------------------- |
11-
| Core Promise APIs | [Antoine du Hamel][aduh95] | <https://github.com/nodejs/TSC/issues/1094> |
12-
| Future of Build Toolchain | [Mary Marchini][mmarchini] | <https://github.com/nodejs/TSC/issues/901>, <https://github.com/nodejs/build-toolchain-next> |
13-
| QUIC / HTTP3 | [James M Snell][jasnell] | <https://github.com/nodejs/quic> |
14-
| Startup performance | [Joyee Cheung][joyeecheung] | <https://github.com/nodejs/node/issues/35711> |
15-
| V8 Currency | [Michaël Zasso][targos] | |
16-
| Next-10 | [Michael Dawson][mhdawson] | <https://github.com/nodejs/next-10> |
9+
| Initiative | Champion | Links |
10+
| ------------------- | --------------------------- | --------------------------------------------- |
11+
| Core Promise APIs | [Antoine du Hamel][aduh95] | <https://github.com/nodejs/TSC/issues/1094> |
12+
| QUIC / HTTP3 | [James M Snell][jasnell] | <https://github.com/nodejs/quic> |
13+
| Startup performance | [Joyee Cheung][joyeecheung] | <https://github.com/nodejs/node/issues/35711> |
14+
| V8 Currency | [Michaël Zasso][targos] | |
15+
| Next-10 | [Michael Dawson][mhdawson] | <https://github.com/nodejs/next-10> |
1716

1817
<details>
1918
<summary>List of completed initiatives</summary>
@@ -40,5 +39,4 @@ agenda to ensure they are active and have the support they need.
4039
[jasnell]: https://github.com/jasnell
4140
[joyeecheung]: https://github.com/joyeecheung
4241
[mhdawson]: https://github.com/mhdawson
43-
[mmarchini]: https://github.com/mmarchini
4442
[targos]: https://github.com/targos

0 commit comments

Comments
 (0)