From 5100c3cad988c0c309cf75e6ac1971b2c3b8d822 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sun, 18 Jul 2021 21:44:05 -0700 Subject: [PATCH] doc,meta: update email addresses for misterdjules Julien Gilli appears twice with two email addresses in the current AUTHORS file. Use .mailmap to map one to the other (keeping the most recent one). Also update email in the README from a (I believe invalid, since it is not listed in the email repo aliases.json file) nodejs.org email to the email they more recently committed with. Finally, re-run `update-authors.js` so they only have one entry in AUTHORS. PR-URL: https://github.com/nodejs/node/pull/39433 Reviewed-By: James M Snell Reviewed-By: Luigi Pinca --- .mailmap | 1 + AUTHORS | 3 +-- README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.mailmap b/.mailmap index 259b8271f63..e9fc7837626 100644 --- a/.mailmap +++ b/.mailmap @@ -212,6 +212,7 @@ Joshua S. Weinstein Joyee Cheung Joyee Cheung Joyee Cheung Juan Soto +Julien Gilli Julien Klepatch Julien Waechter Junliang Yan diff --git a/AUTHORS b/AUTHORS index 21b082f907b..a8159bdbd8e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -587,7 +587,7 @@ Ed Umansky Maurice Butler John Albietz Andrew Oppenlander -Julien Gilli +Julien Gilli Gabriel Wicke Jakob Gillich Lucio M. Tato @@ -2335,7 +2335,6 @@ Sintendo Nitish Sakhawalkar André Cruz Josh Broomfield -Julien Gilli Umang Raghuvanshi Duarte David Aleksey Chemakin diff --git a/README.md b/README.md index 9055580138f..9b08e699a4f 100644 --- a/README.md +++ b/README.md @@ -382,7 +382,7 @@ For information about the governance of the Node.js project, see * [mildsunrise](https://github.com/mildsunrise) - **Alba Mendez** <me@alba.sh> (she/her) * [misterdjules](https://github.com/misterdjules) - -**Julien Gilli** <jgilli@nodejs.org> +**Julien Gilli** <jgilli@netflix.com> * [mmarchini](https://github.com/mmarchini) - **Mary Marchini** <oss@mmarchini.me> (she/her) * [mscdex](https://github.com/mscdex) -