From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 21 Aug 2023 19:16:44 +0000 (-0400)
Subject: Merge PR #52868 into main
X-Git-Tag: v19.0.0~656
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=23e071a93cb8539de8f54a7dbf271c1d1cbf28cf;p=ceph.git

Merge PR #52868 into main

* refs/pull/52868/head:
	mailmap: update affiliations for reef release
	script: fix credits.sh showing 0 lines changed for mapped emails
	script: credits.sh uses grep -E

Reviewed-by: Joshua Baergen <jbaergen@digitalocean.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Zack Cerza <zack@redhat.com>
Reviewed-by: John Mulligan <jmulligan@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Parth Arora <paarora@redhat.com>
Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
Reviewed-by: zmc <NOT@FOUND>
---

23e071a93cb8539de8f54a7dbf271c1d1cbf28cf
diff --cc .githubmap
index fc0bb3bcfbd1,b814d5ccd1f7..08da187a58e5
--- a/.githubmap
+++ b/.githubmap
@@@ -155,3 -170,3 +170,7 @@@ petrutlucian94 Lucian Petrut <lpetrut@c
  dparmar18 Dhairya Parmar <dparmar@redhat.com>
  nmshelke Nikhilkumar Shelke <nshelke@redhat.com>
  neesingh-rh Neeraj Pratap Singh <neesingh@redhat.com>
++parth-gr Parth Arora <paarora@redhat.com>
++phlogistonjohn John Mulligan <jmulligan@redhat.com>
++baergj Joshua Baergen <jbaergen@digitalocean.com>
++zmc Zack Cerza <zack@redhat.com>