Post merge updates

Signed-off-by: Łukasz Gryglicki <[email protected]>
morey-tech · Jun 16, 2023 · ac3cafb · ac3cafb
1 parent 62b3bb1
commit ac3cafb
Show file tree

Hide file tree

Showing 11 changed files with 67 additions and 45 deletions.
diff --git a/company_developers2.txt b/company_developers2.txt
@@ -4549,6 +4549,7 @@ China Mobile Communication Company Ltd:
 	Jing-Scott: jingwenjun!cmss.chinamobile.com, jingwj152!163.com
 	MIBc: lvjiawei!cmss.chinamobile.com
 	Wilhelmshaven: lihongjie!cmss.chinamobile.com
+	bobz965: bobz965!users.noreply.github.com, zhangbingbing2_yewu!cmss.chinamobile.com
 	caogj: caogaojin.nk!gmail.com, caogj!users.noreply.github.com, dyl.griffith!gmail.com
 	chbatey: uestc.shi!gmail.com from 2015-09-30
 	chenfangxian: chenfangxian!cmss.chinamobile.com
@@ -4560,11 +4561,12 @@ China Mobile Communication Company Ltd:
 	joke-lee: joke-lee!users.noreply.github.com, yuliyang!cmss.chinamobile.com
 	junxu: jun.xu.cs!gmail.com, xujun!cmss.chinamobile.com
 	lijianfeng1993: lijianfeng!cmss.chinamobile.com, lijianfeng1993!users.noreply.github.com
-	liuy: liuyuan!cmss.chinamobile.com, mslogicmaster!gmail.com
+	liuy: liuy!users.noreply.github.com, liuyuan!cmss.chinamobile.com, mslogicmaster!gmail.com, yuanliu_yewu!cmss.chinamobile.com
 	liuyuhong66: liuyuhong!cmss.chinamobile.com
 	luogangyi: luogangyi!chinamobile.com, luogangyi!users.noreply.github.com
 	lvchenggang: chengganglv!163.com, lvchenggang!users.noreply.github.com, lvchenggang_yewu!cmss.chinamobile.com
 	muxuelan: 18861821863!163.com, muxuelan!users.noreply.github.com, muxuelan_yewu!cmss.chinamobile.com
+	qiutingjun: qiutingjun!users.noreply.github.com, qiutingjun_yewu!cmss.chinamobile.com
 	shentao999: shentao!chinamobile.com
 	viviyww: jacobbullock95!gmail.com, silverwolf90!gmail.com, vitorruschoni!gmail.com, viviyww!users.noreply.github.com, yangweiwei!cmss.chinamobile.com
 	wangzhengyong: wangzhengyong!cmss.chinamobile.com
@@ -16309,5 +16311,3 @@ Driver and Vehicle Licensing Agency (DVLA):
 	topiaruss: russf!topia.com, topiaruss!users.noreply.github.com
 Driver and Vehicle Standards Agency:
 	devcrust: chr.rust!googlemail.com until 2014-06-01
-Driversiti:
-	brandonbodnar-wk: brandonbodnar-wk!users.noreply.github.com from 2015-10-01 until 2016-05-01
diff --git a/company_developers3.txt b/company_developers3.txt
@@ -2,6 +2,8 @@
 # If you see an error, please update developers_affiliations.txt and this file will be fixed
 # when regenerated.
 #be:
+Driversiti:
+	brandonbodnar-wk: brandonbodnar-wk!users.noreply.github.com from 2015-10-01 until 2016-05-01
 Drivr:
 	Anjmao: andzej.maciusovic!gmail.com from 2016-02-01 until 2018-02-01
 	alvioshki: alvioshki!users.noreply.github.com until 2017-05-01

diff --git a/company_developers4.txt b/company_developers4.txt
@@ -1670,6 +1670,7 @@ Hitachi Ltd.:
 	tnorimat: tnorimat!users.noreply.github.com
 	toyooka: hiraku.toyooka.gu!hitachi.com
 	tsekiyama: tomoki.sekiyama!hds.com
+	ttakahashi21: 106098375+ttakahashi21!users.noreply.github.com, takafumi.takahashi!hitachivantara.com, takafumi.takahashi.fs!hitachi.com, ttakahashi21!users.noreply.github.com
 	y-tabata: y-tabata!users.noreply.github.com
 Hitachi Vantara LLC:
 	CBVenkataReddy: CBVenkataReddy!users.noreply.github.com until 2016-02-01

diff --git a/company_developers9.txt b/company_developers9.txt
@@ -4495,6 +4495,7 @@ Sumo Logic Inc.:
 	bin3377: bin3377!users.noreply.github.com from 2015-12-01 until 2019-06-01
 	blaise-sumo: blaise-sumo!users.noreply.github.com from 2019-02-01
 	devennorton: deven!sumologic.com, deven.norton!gmail.com from 2014-04-01 until 2015-12-01
+	dmolenda-sumo: dmolenda!sumologic.com, dmolenda-sumo!users.noreply.github.com
 	dx9: dx9err!gmail.com from 2018-11-01
 	filipochnik: filip.ochnik!gmail.com, filipochnik!users.noreply.github.com from 2018-04-01
 	frankreno: frank.reno!me.com, frankreno!users.noreply.github.com from 2015-01-01

diff --git a/developers_affiliations2.txt b/developers_affiliations2.txt
@@ -20713,6 +20713,8 @@ bobymicroby: bobymicroby!users.noreply.github.com
 	Novarto until 2018-05-01
 	Badge from 2018-05-01 until 2019-08-01
 	Uber from 2019-08-01
+bobz965: bobz965!users.noreply.github.com, zhangbingbing2_yewu!cmss.chinamobile.com
+	China Mobile Communication Company Ltd
 bobzhangyong: bob_zy!yeah.net
 	Tencent
 bobzilladev: bobzilla!wigle.net, bobzilladev!users.noreply.github.com
@@ -23994,5 +23996,3 @@ capveg: capveg!gmail.com
 caquino: caquino!users.noreply.github.com
 	Zendesk Inc. until 2019-01-01
 	Ubiquiti Inc. from 2019-01-01
-car-roll: car-roll!users.noreply.github.com, cchiou!cloudbees.com
-	CloudBees Inc.
diff --git a/developers_affiliations3.txt b/developers_affiliations3.txt
@@ -5,6 +5,8 @@
 # Note that email addresses below are "best effort" and are out-of-date
 # or inaccurate in many cases. Please do not rely on this email information
 # without verification.
+car-roll: car-roll!users.noreply.github.com, cchiou!cloudbees.com
+	CloudBees Inc.
 carabasdaniel: carabasdaniel!users.noreply.github.com
 	Uhuru until 2015-01-01
 	Hewlett from 2015-01-01 until 2018-05-01
@@ -23979,9 +23981,3 @@ gautambaghel: gautambaghel!users.noreply.github.com
 	Synopsys Inc from 2019-04-01
 gautamdivgi: gautamdivgi!gmail.com, gautamdivgi!users.noreply.github.com
 	AT&T Services Inc.
-gautamkmr: gautamkmr!users.noreply.github.com, gautamnitc!gmail.com
-	Independent until 2015-01-01
-	Meta Platforms Inc. from 2015-01-01 until 2015-06-01
-	Amazon from 2015-06-01
-gauthierbl: brandon.l.gauthier!gmail.com, gauthierbl!users.noreply.github.com
-	Content Analyst Company
diff --git a/developers_affiliations4.txt b/developers_affiliations4.txt
@@ -5,6 +5,12 @@
 # Note that email addresses below are "best effort" and are out-of-date
 # or inaccurate in many cases. Please do not rely on this email information
 # without verification.
+gautamkmr: gautamkmr!users.noreply.github.com, gautamnitc!gmail.com
+	Independent until 2015-01-01
+	Meta Platforms Inc. from 2015-01-01 until 2015-06-01
+	Amazon from 2015-06-01
+gauthierbl: brandon.l.gauthier!gmail.com, gauthierbl!users.noreply.github.com
+	Content Analyst Company
 gautierdelorme: gautier.delorme!gmail.com, gautierdelorme!users.noreply.github.com, gdelorme!apple.com
 	Apple Inc.
 gautric: gautric!users.noreply.github.com
@@ -24096,12 +24102,3 @@ kkobayas: kkobayas!igel.co.jp
 	IGEL Technology GmbH
 kkohtaka: 234269+kkohtaka!users.noreply.github.com, kkohtaka!gmail.com, kkohtaka!users.noreply.github.com, kkotaka!zlab.co.jp
 	Z Lab
-kkokufud: kkokufud!users.noreply.github.com
-	Nihon Unisys until 2019-03-01
-	Yahoo! Inc. from 2019-03-01
-kkoller: kkoller!users.noreply.github.com
-	Red Hat Inc.
-kkonradI: konrad.kurdej!intel.com
-	Intel Corporation
-kkosaka: 33753956+kkosaka!users.noreply.github.com, ksk3.kk!gmail.com
-	Fujitsu Limited
diff --git a/developers_affiliations5.txt b/developers_affiliations5.txt
@@ -5,6 +5,15 @@
 # Note that email addresses below are "best effort" and are out-of-date
 # or inaccurate in many cases. Please do not rely on this email information
 # without verification.
+kkokufud: kkokufud!users.noreply.github.com
+	Nihon Unisys until 2019-03-01
+	Yahoo! Inc. from 2019-03-01
+kkoller: kkoller!users.noreply.github.com
+	Red Hat Inc.
+kkonradI: konrad.kurdej!intel.com
+	Intel Corporation
+kkosaka: 33753956+kkosaka!users.noreply.github.com, ksk3.kk!gmail.com
+	Fujitsu Limited
 kkourt: kou!zurich.ibm.com
 	International Business Machines Corporation until 2020-06-01
 	Isovalent from 2020-06-01
@@ -4776,7 +4785,7 @@ liuweiGL: liuwei89757!gmail.com
 	Automobile Comercio De Pecas Ltda
 liuxu623: liuxu623!gmail.com, liuxu623!users.noreply.github.com
 	Beijing Zhiren Tianxia Technology Co. Ltd.
-liuy: liuyuan!cmss.chinamobile.com, mslogicmaster!gmail.com
+liuy: liuy!users.noreply.github.com, liuyuan!cmss.chinamobile.com, mslogicmaster!gmail.com, yuanliu_yewu!cmss.chinamobile.com
 	China Mobile Communication Company Ltd
 liuy: namei.unix!gmail.com
 	Taobao
@@ -24113,14 +24122,3 @@ om-gupta: om-gupta!users.noreply.github.com, om.gupta!hotmail.com
 	Microsoft Corporation
 om2137: om2137!users.noreply.github.com
 	Independent
-omBratteng: omBratteng!users.noreply.github.com
-	Independent until 2016-11-01
-	Bratteng Solutions from 2016-11-01 until 2018-02-01
-	Elgesetergt 58 AS from 2018-02-01 until 2019-04-01
-	Arkivverket from 2019-04-01
-omajid: omajid!redhat.com
-	Red Hat Inc.
-omamoo: omamoo!users.noreply.github.com
-	Independent until 2018-03-01
-	Allot Ltd. from 2018-03-01 until 2021-10-01
-	Ermetic from 2021-10-01
diff --git a/developers_affiliations6.txt b/developers_affiliations6.txt
@@ -5,6 +5,17 @@
 # Note that email addresses below are "best effort" and are out-of-date
 # or inaccurate in many cases. Please do not rely on this email information
 # without verification.
+omBratteng: omBratteng!users.noreply.github.com
+	Independent until 2016-11-01
+	Bratteng Solutions from 2016-11-01 until 2018-02-01
+	Elgesetergt 58 AS from 2018-02-01 until 2019-04-01
+	Arkivverket from 2019-04-01
+omajid: omajid!redhat.com
+	Red Hat Inc.
+omamoo: omamoo!users.noreply.github.com
+	Independent until 2018-03-01
+	Allot Ltd. from 2018-03-01 until 2021-10-01
+	Ermetic from 2021-10-01
 omansion: olivier.mansion!shiningpanda.com
 	Eileo until 2017-07-01
 	NeoXam Singapore Pte Ltd from 2017-07-01
@@ -7077,6 +7088,8 @@ qiupeng-huacloud: christophe.meessen!gmail.com, gaganbansal123!gmail.com, imiren
 	China Cloud
 qiushui123: 1548110942!qq.com
 	null
+qiutingjun: qiutingjun!users.noreply.github.com, qiutingjun_yewu!cmss.chinamobile.com
+	China Mobile Communication Company Ltd
 qiutongs: qiutongs!users.noreply.github.com
 	Google LLC
 qiuyesuifeng: cuiqiu.bupt!gmail.com, qiuyesuifeng!users.noreply.github.com
@@ -24078,14 +24091,3 @@ stanley-cheung: stanley.cheung!gmail.com, stanleycheung!google.com
 stanleyhlng: stanleyhlng!users.noreply.github.com
 	Yahoo! Inc. until 2016-07-01
 	Splunk Inc. from 2016-07-01
-stanleynguyen: stanleynguyen!users.noreply.github.com
-	Independent until 2016-01-01
-	$MARTBIN from 2016-01-01 until 2016-06-01
-	Stacck from 2016-06-01 until 2016-08-01
-	Independent from 2016-08-01 until 2017-05-01
-	Visa Inc. from 2017-05-01 until 2017-08-01
-	FirstTouch from 2017-08-01 until 2018-08-01
-	Visa Inc. from 2018-08-01 until 2019-11-01
-	Xendit from 2019-11-01
-stanlyDoge: sknot!redhat.com, stanlyDoge!users.noreply.github.com
-	Red Hat Inc.
diff --git a/developers_affiliations7.txt b/developers_affiliations7.txt
@@ -5,6 +5,17 @@
 # Note that email addresses below are "best effort" and are out-of-date
 # or inaccurate in many cases. Please do not rely on this email information
 # without verification.
+stanleynguyen: stanleynguyen!users.noreply.github.com
+	Independent until 2016-01-01
+	$MARTBIN from 2016-01-01 until 2016-06-01
+	Stacck from 2016-06-01 until 2016-08-01
+	Independent from 2016-08-01 until 2017-05-01
+	Visa Inc. from 2017-05-01 until 2017-08-01
+	FirstTouch from 2017-08-01 until 2018-08-01
+	Visa Inc. from 2018-08-01 until 2019-11-01
+	Xendit from 2019-11-01
+stanlyDoge: sknot!redhat.com, stanlyDoge!users.noreply.github.com
+	Red Hat Inc.
 stanspotts: stan.spotts!live.com, stanspotts!users.noreply.github.com
 	WCG ePharmaSolutions until 2017-01-01
 	LexisNexis from 2017-01-01 until 2021-07-01
@@ -8844,8 +8855,8 @@ tt: tt!users.noreply.github.com
 	Heroku Inc.
 ttacon: ttacon!gmail.com, ttacon!users.noreply.github.com
 	mixmaxhq
-ttakahashi21: takafumi.takahashi!hitachivantara.com, takafumi.takahashi.fs!hitachi.com, 106098375+ttakahashi21@users.noreply.github.com
-        Hitachi Ltd.	
+ttakahashi21: 106098375+ttakahashi21!users.noreply.github.com, takafumi.takahashi!hitachivantara.com, takafumi.takahashi.fs!hitachi.com, ttakahashi21!users.noreply.github.com
+	Hitachi Ltd.
 ttanimichi: info+github!ttanimichi.com
 	Independent
 ttarczynski: ttarczynski!users.noreply.github.com

diff --git a/src/cncf-config/email-map b/src/cncf-config/email-map
@@ -153,6 +153,7 @@
 1059418212!qq.com Inspur Group
 1060026287!qq.com 同程旅行
 1060096267!qq.com Toehold
+106098375+ttakahashi21!users.noreply.github.com Hitachi Ltd.
 1062186165!qq.com Belatrix < 2016-08-01
 1062186165!qq.com DREAMLINES < 2018-10-01
 1062186165!qq.com Etermax < 2016-01-01
@@ -25810,6 +25811,7 @@ bobymcbobs!users.noreply.github.com Independent
 bobymicroby!users.noreply.github.com Badge < 2019-08-01
 bobymicroby!users.noreply.github.com Novarto < 2018-05-01
 bobymicroby!users.noreply.github.com Uber
+bobz965!users.noreply.github.com China Mobile Communication Company Ltd
 bobzilla!wigle.net Wigle
 bocharovf!gmail.com Microsoft Corporation < 2018-05-01
 bocharovf!gmail.com Renault < 2017-07-01
@@ -44738,6 +44740,8 @@ dmnboutin!users.noreply.github.com Cegedim Santé
 dmnboutin!users.noreply.github.com e.Voyageurs SNCF < 2022-06-01
 dmnfortytwo!users.noreply.github.com NotFound
 dmoessne!users.noreply.github.com Red Hat Inc.
+dmolenda!sumologic.com Sumo Logic Inc.
+dmolenda-sumo!users.noreply.github.com Sumo Logic Inc.
 dmolim!users.noreply.github.com Desire FM < 2015-07-01
 dmolim!users.noreply.github.com Gamity < 2017-11-01
 dmolim!users.noreply.github.com Hamster Marketplace < 2018-02-01
@@ -91871,6 +91875,7 @@ liuxuenetmail!gmail.com Lehrstuhls für
 liuxuenetmail!gmail.com lthinx GmbH < 2018-01-01
 liuxulei!ghostcloud.cn Ghostcloud Chengdu Wizard Cloud Technology Co. Ltd.
 liuxy0551!qq.com NotFound
+liuy!users.noreply.github.com China Mobile Communication Company Ltd
 liuy139!gmail.com Microsoft Corporation < 2015-10-01
 liuy139!gmail.com Stripe Inc.
 liuy139!gmail.com Uber < 2017-12-01
@@ -91895,6 +91900,7 @@ liuyitao811!hotmail.com Tencent Holdings Limited
 liuyixuee!users.noreply.github.com NotFound
 liuyongqing1!users.noreply.github.com NotFound
 liuyoung00!users.noreply.github.com Inspur Group
+liuyuan!cmss.chinamobile.com China Mobile Communication Company Ltd
 liuyuhong!cmss.chinamobile.com China Mobile Communication Company Ltd
 liuyulong!le.com Independent
 liuyulong!le.com Independent < 2014-08-05
@@ -108285,6 +108291,7 @@ mskonovalov!gmail.com RingCentral Inc. < 2017-10-01
 mskrocki!users.noreply.github.com Google LLC
 mskrocki!users.noreply.github.com Intel Corporation < 2019-06-01
 mskxn!users.noreply.github.com NotFound
+mslogicmaster!gmail.com China Mobile Communication Company Ltd
 msluiter!redhat.com Luminis < 2018-04-30
 msluiter!redhat.com Red Hat Inc.
 msm!redhat.com Red Hat Inc.
@@ -123298,6 +123305,8 @@ qiuming_yewu!cmss.chinamobile.com NotFound
 qiupeng!chinacloud.com.cn China Cloud
 qiushida!beyondcent.com Alibaba.com
 qiushida!beyondcent.com BoCloud < 2020-07-30
+qiutingjun!users.noreply.github.com China Mobile Communication Company Ltd
+qiutingjun_yewu!cmss.chinamobile.com China Mobile Communication Company Ltd
 qiutongs!users.noreply.github.com Google LLC
 qiuxiafei!users.noreply.github.com Alibaba.com
 qiuyesuifeng!users.noreply.github.com PingCAP
@@ -146457,6 +146466,8 @@ takaaki.furukawa!rakops.com Rakuten Group Inc.
 takac!users.noreply.github.com HP Inc.
 takada-s!iij.ad.jp Internet Initiative Japan Inc.
 takada-s!users.noreply.github.com Internet Initiative Japan Inc.
+takafumi.takahashi!hitachivantara.com Hitachi Ltd.
+takafumi.takahashi.fs!hitachi.com Hitachi Ltd.
 takahasi!sample.com Panasonic ATD
 takakiku810!gmail.com NotFound
 takanabe.w!gmail.com Cookpad Inc. (UK)
@@ -152664,6 +152675,7 @@ tsyrfa!users.noreply.github.com NotFound
 tszngai!users.noreply.github.com NotFound
 tt!users.noreply.github.com Heroku Inc.
 ttacon!gmail.com mixmaxhq
+ttakahashi21!users.noreply.github.com Hitachi Ltd.
 ttarczynski!users.noreply.github.com Gigaset
 ttauveron!users.noreply.github.com ApplETS < 2018-01-01
 ttauveron!users.noreply.github.com Bell < 2017-08-01
@@ -163921,6 +163933,7 @@ yuanlin.yxu!gmail.com Independent < 2015-04-01
 yuanlin.yxu!gmail.com International Business Machines Corporation < 2018-08-01
 yuanlin.yxu!gmail.com Red Hat Inc.
 yuanliu89!gmail.com NotFound
+yuanliu_yewu!cmss.chinamobile.com China Mobile Communication Company Ltd
 yuanman0109!users.noreply.github.com NotFound
 yuanmwang-wf!users.noreply.github.com Workiva Inc.
 yuanoook!gmail.com EPAM Systems Inc
@@ -165441,6 +165454,7 @@ zhanganan0425!163.com Huawei Technologies Co. Ltd
 zhangbailin!inspur.com Inspur Group
 zhangbailin!users.noreply.github.com Inspur Group
 zhangbaitong!163.com NetEase Inc
+zhangbingbing2_yewu!cmss.chinamobile.com China Mobile Communication Company Ltd
 zhangbingyin!cloudin.cn Cloudin
 zhangbo1882!gmail.com AWS
 zhangbo1882!gmail.com BlackBerry Limited < 2017-04-01