Merge branch 'nodejs:master' into test-test-runner-coverage

nodejs · Apr 16, 2022 · 330f986 · 330f986
2 parents 711186b + b008e96
commit 330f986
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -180,8 +180,6 @@ For information about the governance of the Node.js project, see
   **Matteo Collina** <<matteo.collina@gmail.com>> (he/him)
 * [mhdawson](https://github.com/mhdawson) -
   **Michael Dawson** <<midawson@redhat.com>> (he/him)
-* [mmarchini](https://github.com/mmarchini) -
-  **Mary Marchini** <<oss@mmarchini.me>> (she/her)
 * [MylesBorins](https://github.com/MylesBorins) -
   **Myles Borins** <<myles.borins@gmail.com>> (he/him)
 * [RaisinTen](https://github.com/RaisinTen) -
@@ -227,6 +225,8 @@ For information about the governance of the Node.js project, see
   **Isaac Z. Schlueter** <<i@izs.me>>
 * [joshgav](https://github.com/joshgav) -
   **Josh Gavant** <<josh.gavant@outlook.com>>
+* [mmarchini](https://github.com/mmarchini) -
+  **Mary Marchini** <<oss@mmarchini.me>> (she/her)
 * [mscdex](https://github.com/mscdex) -
   **Brian White** <<mscdex@mscdex.net>>
 * [nebrius](https://github.com/nebrius) -
@@ -380,8 +380,6 @@ For information about the governance of the Node.js project, see
   **Milad Fa** <<mfarazma@redhat.com>> (he/him)
 * [mildsunrise](https://github.com/mildsunrise) -
   **Alba Mendez** <<me@alba.sh>> (she/her)
-* [mmarchini](https://github.com/mmarchini) -
-  **Mary Marchini** <<oss@mmarchini.me>> (she/her)
 * [mscdex](https://github.com/mscdex) -
   **Brian White** <<mscdex@mscdex.net>>
 * [MylesBorins](https://github.com/MylesBorins) -
@@ -552,6 +550,8 @@ For information about the governance of the Node.js project, see
   **Mikeal Rogers** <<mikeal.rogers@gmail.com>>
 * [misterdjules](https://github.com/misterdjules) -
   **Julien Gilli** <<jgilli@netflix.com>>
+* [mmarchini](https://github.com/mmarchini) -
+  **Mary Marchini** <<oss@mmarchini.me>> (she/her)
 * [monsanto](https://github.com/monsanto) -
   **Christopher Monsanto** <<chris@monsan.to>>
 * [MoonBall](https://github.com/MoonBall) -

diff --git a/doc/contributing/diagnostic-tooling-support-tiers.md b/doc/contributing/diagnostic-tooling-support-tiers.md
@@ -125,7 +125,6 @@ The tools are currently assigned to Tiers as follows:
 | Tool Type | Tool/API Name             | Regular Testing in Node.js CI | Integrated with Node.js | Target Tier |
 | --------- | ------------------------- | ----------------------------- | ----------------------- | ----------- |
 | FFDC      | node-report               | No                            | No                      | 1           |
-| Memory    | mdb\_V8                   | No                            | No                      | 4           |
 | Memory    | node-heapdump             | No                            | No                      | 2           |
 | Memory    | V8 heap profiler          | No                            | Yes                     | 1           |
 | Memory    | V8 sampling heap profiler | No                            | Yes                     | 1           |

diff --git a/doc/contributing/strategic-initiatives.md b/doc/contributing/strategic-initiatives.md
@@ -6,14 +6,13 @@ agenda to ensure they are active and have the support they need.
 
 ## Current initiatives
 
-| Initiative                | Champion                    | Links                                                                                        |
-| ------------------------- | --------------------------- | -------------------------------------------------------------------------------------------- |
-| Core Promise APIs         | [Antoine du Hamel][aduh95]  | <https://github.com/nodejs/TSC/issues/1094>                                                  |
-| Future of Build Toolchain | [Mary Marchini][mmarchini]  | <https://github.com/nodejs/TSC/issues/901>, <https://github.com/nodejs/build-toolchain-next> |
-| QUIC / HTTP3              | [James M Snell][jasnell]    | <https://github.com/nodejs/quic>                                                             |
-| Startup performance       | [Joyee Cheung][joyeecheung] | <https://github.com/nodejs/node/issues/35711>                                                |
-| V8 Currency               | [Michaël Zasso][targos]     |                                                                                              |
-| Next-10                   | [Michael Dawson][mhdawson]  | <https://github.com/nodejs/next-10>                                                          |
+| Initiative          | Champion                    | Links                                         |
+| ------------------- | --------------------------- | --------------------------------------------- |
+| Core Promise APIs   | [Antoine du Hamel][aduh95]  | <https://github.com/nodejs/TSC/issues/1094>   |
+| QUIC / HTTP3        | [James M Snell][jasnell]    | <https://github.com/nodejs/quic>              |
+| Startup performance | [Joyee Cheung][joyeecheung] | <https://github.com/nodejs/node/issues/35711> |
+| V8 Currency         | [Michaël Zasso][targos]     |                                               |
+| Next-10             | [Michael Dawson][mhdawson]  | <https://github.com/nodejs/next-10>           |
 
 <details>
 <summary>List of completed initiatives</summary>
@@ -40,5 +39,4 @@ agenda to ensure they are active and have the support they need.
 [jasnell]: https://github.com/jasnell
 [joyeecheung]: https://github.com/joyeecheung
 [mhdawson]: https://github.com/mhdawson
-[mmarchini]: https://github.com/mmarchini
 [targos]: https://github.com/targos