From 1554f345872ef65ecd4f043607ff2289790560bc Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Mon, 25 Oct 2021 14:11:27 -0700
Subject: [PATCH] meta: consolidate AUTHORS entries for brettkiefer

---
 .mailmap | 1 +
 AUTHORS  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index eb72aa57cc2cc2..de7ba0923aefc7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -68,6 +68,7 @@ Brandon Benvie <brandon@bbenvie.com> <brandon@brandonbenvie.com>
 Brandon Kobel <kobelb@gmail.com> <brandon.kobel@elastic.co>
 Brendan Ashworth <brendan.ashworth@me.com> <squirrelslikeacorns@gmail.com>
 Brent Pendergraft <bpent3l@gmail.com>
+Brett Kiefer <kiefer@gmail.com> <brett@trello.com>
 Brian White <mscdex@mscdex.net>
 Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
 Caleb Boyd <caleb.boyd@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 3e2f9f6fc82945..e564ee5a45c38d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2219,7 +2219,6 @@ Misty De Meo <mistydemeo@gmail.com>
 James Kylstra <kylstraj@oregonstate.edu>
 Shelley Vohr <shelley.vohr@gmail.com>
 Deepjyoti Mondal <djmdeveloper060796@gmail.com>
-Brett Kiefer <brett@trello.com>
 Kevin Thomas <kevintab95@gmail.com>
 ZaneHannanAU <ZaneHannanAU@users.noreply.github.com>
 Fernando Doglio <deleteman@gmail.com>