Merge PR ceph#60302 into main

batrick · batrick · commit 224ce0ff3901 · 2024-10-15T09:01:29.000-04:00
* refs/pull/60302/head:
	doc/governance: update my CSC email
	mailmap: add my ibm email

Reviewed-by: Anthony D Atri &lt;anthony.datri@gmail.com&gt;
diff --git a/.githubmap b/.githubmap
@@ -27,7 +27,7 @@ b-ranto Boris Ranto <branto@redhat.com>
 badone Brad Hubbard <bhubbard@redhat.com>
 baruza Barbora Ančincová <bara@redhat.com>
 bassamtabbara Bassam Tabbara <bassam.tabbara@quantum.com>
-batrick Patrick Donnelly <pdonnell@redhat.com>
+batrick Patrick Donnelly <pdonnell@ibm.com>
 bigjust Justin Caratzas <jcaratza@redhat.com>
 bk201 Kiefer Chang <kiefer.chang@suse.com>
 BlaineEXE Blaine Gardner <bgardner@suse.com>
diff --git a/.mailmap b/.mailmap
@@ -544,7 +544,8 @@ Pan Liu <pan.liu@istuary.com> <liupan1111@gmail.com>
 Parth Arora <paarora@redhat.com> parth-gr <paarora@redhat.com>
 Pascal de Bruijn <pascal@unilogicnetworks.net>
 Patience Warnick <patience@cranium.pelton.net> <patiencew@29311d96-e01e-0410-9327-a35deaab8ce9>
-Patrick Donnelly <pdonnell@redhat.com> <pdonell@redhat.com>
+Patrick Donnelly <pdonnell@ibm.com> <pdonnell@redhat.com>
+Patrick Donnelly <pdonnell@ibm.com> <batrick@batbytes.com>
 Patrick McGarry <patrick@inktank.com>
 Patrick McGarry <pmcgarry@redhat.com> <pmcgarry@gmail.com>
 Patrick Seidensal <pseidensal@suse.com>
diff --git a/.organizationmap b/.organizationmap
@@ -361,6 +361,7 @@ IBM <contact@IBM.com> Samuel Matzek <smatzek@us.ibm.com>
 IBM <contact@IBM.com> Shraddha Agrawal <shraddhaag@ibm.com>
 IBM <contact@IBM.com> Kushal Deb <Kushal.Deb@ibm.com>
 IBM <contact@IBM.com> Shweta Bhosale <Shweta.Bhosale1@ibm.com>
+IBM <contact@IBM.com> Patrick Donnelly <pdonnell@ibm.com>
 IBM <contact@IBM.com> Sunil Angadi <Sunil.Angadi@ibm.com>
 IBM <contact@IBM.com> Teoman Onay <tonay@ibm.com>
 IBM <contact@ibm.com> Ulrich Weigand <ulrich.weigand@de.ibm.com>
diff --git a/.peoplemap b/.peoplemap
@@ -73,5 +73,5 @@ Yehuda Sadeh <ysadehwe@redhat.com> Yehuda Sadeh <yehuda@inktank.com>
 Yuri Weinstein <yuriw@redhat.com> Yuri Weinstein <yuri.weinstein@inktank.com>
 Zhi Zhang <zhangz.david@outlook.com> Zhi (David) Zhang <zhangz@yahoo-inc.com>
 Zheng Yin <zhengyin@huayun.com> Zheng Yin <zhengyin@chinac.com>
-Patrick Donnelly <pdonnell@redhat.com> Patrick Donnelly <batrick@batbytes.com>
+Patrick Donnelly <pdonnell@ibm.com> Patrick Donnelly <pdonnell@redhat.com> Patrick Donnelly <batrick@batbytes.com>
 Myoungwon Oh <myoungwon.oh@samsung.com> Myoungwon Oh <omwmw@sk.com> Myoungwon Oh <ohmyoungwon@gmail.com>
diff --git a/doc/governance.rst b/doc/governance.rst
@@ -96,7 +96,7 @@ Current Members
  * Mike Perez <miperez@redhat.com>
  * Myoungwon Oh <myoungwon.oh@samsung.com>
  * Neha Ojha <nojha@redhat.com>
- * Patrick Donnelly <pdonnell@redhat.com>
+ * Patrick Donnelly <pdonnell@ibm.com>
  * Sam Just <sjust@redhat.com>
  * Vikhyat Umrao <vikhyat@redhat.com>
  * Xie Xingguo <xie.xingguo@zte.com.cn>

-Original file line number
+Diff line change
 badone Brad Hubbard <[email protected]>
 baruza Barbora Ančincová <[email protected]>
 bassamtabbara Bassam Tabbara <[email protected]>
 -batrick Patrick Donnelly <pdonnell@redhat.com>
 +batrick Patrick Donnelly <pdonnell@ibm.com>
 bigjust Justin Caratzas <[email protected]>
 bk201 Kiefer Chang <[email protected]>
 BlaineEXE Blaine Gardner <[email protected]>
-Original file line number
+Diff line change
 Parth Arora <[email protected]> parth-gr <[email protected]>
 Pascal de Bruijn <[email protected]>
 Patience Warnick <[email protected]> <patiencew@29311d96-e01e-0410-9327-a35deaab8ce9>
 -Patrick Donnelly <[email protected]> <[email protected]>
 +Patrick Donnelly <[email protected]> <[email protected]>
 +Patrick Donnelly <[email protected]> <[email protected]>
 Patrick McGarry <[email protected]>
 Patrick McGarry <[email protected]> <[email protected]>
 Patrick Seidensal <[email protected]>
-Original file line number
+Diff line change
 IBM <[email protected]> Shraddha Agrawal <[email protected]>
 IBM <[email protected]> Kushal Deb <[email protected]>
 IBM <[email protected]> Shweta Bhosale <[email protected]>
 +IBM <[email protected]> Patrick Donnelly <[email protected]>
 IBM <[email protected]> Sunil Angadi <[email protected]>
 IBM <[email protected]> Teoman Onay <[email protected]>
 IBM <[email protected]> Ulrich Weigand <[email protected]>
-Original file line number
+Diff line change
 Yuri Weinstein <[email protected]> Yuri Weinstein <[email protected]>
 Zhi Zhang <[email protected]> Zhi (David) Zhang <[email protected]>
 Zheng Yin <[email protected]> Zheng Yin <[email protected]>
 -Patrick Donnelly <[email protected]> Patrick Donnelly <[email protected]>
 +Patrick Donnelly <pdonnell@ibm.com> Patrick Donnelly <pdonnell@redhat.com> Patrick Donnelly <[email protected]>
 Myoungwon Oh <[email protected]> Myoungwon Oh <[email protected]> Myoungwon Oh <[email protected]>
-Original file line number
+Diff line change
  * Mike Perez <[email protected]>
  * Myoungwon Oh <[email protected]>
  * Neha Ojha <[email protected]>
 - * Patrick Donnelly <pdonnell@redhat.com>
 + * Patrick Donnelly <pdonnell@ibm.com>
  * Sam Just <[email protected]>
  * Vikhyat Umrao <[email protected]>
  * Xie Xingguo <[email protected]>