From d4cb5f29d53622a928ac13135dd1d03fd6db905a Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sun, 26 Sep 2021 10:20:23 -0700
Subject: [PATCH] meta: add .mailmap entry for daguej

Consolidate duplicate AUTHORS entries with a .mailmap entry.
---
 .mailmap | 1 +
 AUTHORS  | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index d9638e5b9d0f2e..ec8fe432dcf9f0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -215,6 +215,7 @@ Jonathan Persson <persson.jonathan@gmail.com> <jonathan.persson@creuna.se>
 Jonathan Rentzsch <jwr.git@redshed.net>
 Jose Luis Vivero <josluivivgar@gmail.com>
 Joseph Leon <joseph.leon.9@gmail.com>
+Josh Dague <jd@josh3736.net> <daguej@email.uc.edu>
 Josh Erickson <josh@snoj.us>
 Josh Hunter <jopann@gmail.com>
 Joshua S. Weinstein <josher19@users.sf.net>
diff --git a/AUTHORS b/AUTHORS
index 8960aa669146a8..8bf2cee2f43474 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -541,7 +541,7 @@ Maxwell Krohn <themax@gmail.com>
 Saúl Ibarra Corretgé <s@saghul.net>
 Greg Brail <greg@apigee.com>
 Shuhei Kagawa <shuhei.kagawa@gmail.com>
-Josh Dague <daguej@email.uc.edu>
+Josh Dague <jd@josh3736.net>
 Goh Yisheng (Andrew) <mail.yisheng@gmail.com>
 James Pickard <james.pickard@gmail.com>
 Andrew Low <Andrew_Low@ca.ibm.com>
@@ -3134,7 +3134,6 @@ lucasg <lucas.georges@outlook.com>
 Brian 'bdougie' Douglas <ilikerobot@gmail.com>
 Lee, Bonggi <iyabong@gmail.com>
 Momtchil Momtchev <momtchil@momtchev.com>
-Josh Dague <jd@josh3736.net>
 Vincent Boivin <vboivin04@gmail.com>
 ax1 <16510021+ax1@users.noreply.github.com>
 Shubham Parihar <51517103+iShibi@users.noreply.github.com>