From 5100c3cad988c0c309cf75e6ac1971b2c3b8d822 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
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 <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
---
 .mailmap  | 1 +
 AUTHORS   | 3 +--
 README.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.mailmap b/.mailmap
index 259b8271f6319e..e9fc78376263d9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -212,6 +212,7 @@ Joshua S. Weinstein <josher19@users.sf.net>
 Joyee Cheung <joyeec9h3@gmail.com>
 Joyee Cheung <joyeec9h3@gmail.com> Joyee Cheung <joyee@igalia.com>
 Juan Soto <juan@juansoto.me>
+Julien Gilli <jgilli@netflix.com> <julien.gilli@joyent.com>
 Julien Klepatch <julien@julienklepatch.com>
 Julien Waechter <julien.waechter@gmail.com>
 Junliang Yan <john.yan1019@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 21b082f907b51b..a8159bdbd8e243 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -587,7 +587,7 @@ Ed Umansky <edumansky@gmail.com>
 Maurice Butler <maurice.butler@gmail.com>
 John Albietz <inthecloud247@gmail.com>
 Andrew Oppenlander <andrew.oppenlander@zipscene.com>
-Julien Gilli <julien.gilli@joyent.com>
+Julien Gilli <jgilli@netflix.com>
 Gabriel Wicke <wicke@wikidev.net>
 Jakob Gillich <jakob@gillich.me>
 Lucio M. Tato <luciotato@gmail.com>
@@ -2335,7 +2335,6 @@ Sintendo <bram.speeckaert@gmail.com>
 Nitish Sakhawalkar <nitsakh@icloud.com>
 André Cruz <andre@cabine.org>
 Josh Broomfield <josh.m.broomfield@gmail.com>
-Julien Gilli <jgilli@netflix.com>
 Umang Raghuvanshi <u@umangis.me>
 Duarte David <deltaduartedavid@gmail.com>
 Aleksey Chemakin <Dzenly@users.noreply.github.com>
diff --git a/README.md b/README.md
index 9055580138f218..9b08e699a4f19a 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** &lt;me@alba.sh&gt; (she/her)
 * [misterdjules](https://github.com/misterdjules) -
-**Julien Gilli** &lt;jgilli@nodejs.org&gt;
+**Julien Gilli** &lt;jgilli@netflix.com&gt;
 * [mmarchini](https://github.com/mmarchini) -
 **Mary Marchini** &lt;oss@mmarchini.me&gt; (she/her)
 * [mscdex](https://github.com/mscdex) -