Post merge updates

Signed-off-by: Łukasz Gryglicki <[email protected]>

company_developers3.txt

@@ -6499,6 +6499,7 @@ Huawei Technologies Co. Ltd:
 	Rajadeepan: Rajadeepan!users.noreply.github.com, rajadeepan.d.ramesh!huawei.com
 	RicardoZPHuang: RicardoZPHuang!users.noreply.github.com, huangzhipeng12!huawei.com
 	RichardWeiYang: richard.weiyang!gmail.com from 2015-12-01 until 2017-02-01
+	RyanZhaoXB: RyanZhaoXB!users.noreply.github.com, zhaor_thu!163.com
 	Satishk-Huawei: satishk!huawei.com
 	Seshu-Kumar-M: seshu.kumar.m!huawei.com
 	Shankara-Huawei: shankara!huawei.com

developers_affiliations1.txt

@@ -14771,7 +14771,7 @@ RyanW8: RyanW8!users.noreply.github.com
 	Node4 from 2017-11-01 until 2020-01-01
 	Telent from 2020-01-01 until 2020-03-01
 	Nutmeg from 2020-03-01
-RyanZhaoXB: zhaor_thu!163.com
+RyanZhaoXB: RyanZhaoXB!users.noreply.github.com, zhaor_thu!163.com
 	Huawei Technologies Co. Ltd
 RyanZim: opensrc!ryanzim.com, ryanzim!users.noreply.github.com
 	Independent
@@ -23747,13 +23747,3 @@ allanchua101: allanchua101!users.noreply.github.com
 	Credit Agricole Americas from 2017-04-01 until 2018-08-01
 	Sleek from 2018-08-01 until 2019-03-01
 	FWD Insurance from 2019-03-01
-allandegnan: allan!secureweb.ltd
-	Tuxedo Money until 2014-05-01
-	Eventpad from 2014-05-01 until 2014-08-01
-	Myorb from 2014-08-01 until 2014-10-01
-	Orange SA from 2014-10-01 until 2014-12-01
-	Independent from 2014-12-01 until 2017-08-01
-	Dixons Carphone from 2017-08-01 until 2019-03-01
-	Independent from 2019-03-01 until 2020-01-01
-	Refinitiv from 2020-01-01 until 2020-10-01
-	Secureweb from 2020-10-01

developers_affiliations2.txt

@@ -5,6 +5,16 @@
 # 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.
+allandegnan: allan!secureweb.ltd
+	Tuxedo Money until 2014-05-01
+	Eventpad from 2014-05-01 until 2014-08-01
+	Myorb from 2014-08-01 until 2014-10-01
+	Orange SA from 2014-10-01 until 2014-12-01
+	Independent from 2014-12-01 until 2017-08-01
+	Dixons Carphone from 2017-08-01 until 2019-03-01
+	Independent from 2019-03-01 until 2020-01-01
+	Refinitiv from 2020-01-01 until 2020-10-01
+	Secureweb from 2020-10-01
 allanitis: matthewa021!gmail.com
 	Independent until 2015-06-01
 	Quartzy from 2015-06-01 until 2019-03-01
@@ -23885,15 +23895,3 @@ dymurray: dymurray!redhat.com, dymurray!users.noreply.github.com
 	Independent from 2014-08-01 until 2015-06-01
 	Dell EMC from 2015-06-01 until 2015-12-01
 	Red Hat Inc. from 2015-12-01
-dynamicmindset: dynamicmindset!users.noreply.github.com
-	Hewlett until 2016-05-01
-	ComplyAdvantage from 2016-05-01 until 2021-06-01
-	Ebury from 2021-06-01
-dynek: dynek!users.noreply.github.com
-	blue-infinity until 2017-07-01
-	Wipro Limited from 2017-07-01 until 2018-05-01
-	Kudelski Security from 2018-05-01
-dystopiandev: dystopiandev!users.noreply.github.com, me!dystopian.dev
-	Dualsight
-dyusupov: dmitry!nexenta.com, dyusupov!users.noreply.github.com
-	Nexenta Systems Inc.

developers_affiliations3.txt

@@ -5,6 +5,18 @@
 # 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.
+dynamicmindset: dynamicmindset!users.noreply.github.com
+	Hewlett until 2016-05-01
+	ComplyAdvantage from 2016-05-01 until 2021-06-01
+	Ebury from 2021-06-01
+dynek: dynek!users.noreply.github.com
+	blue-infinity until 2017-07-01
+	Wipro Limited from 2017-07-01 until 2018-05-01
+	Kudelski Security from 2018-05-01
+dystopiandev: dystopiandev!users.noreply.github.com, me!dystopian.dev
+	Dualsight
+dyusupov: dmitry!nexenta.com, dyusupov!users.noreply.github.com
+	Nexenta Systems Inc.
 dzafman: dzafman!redhat.com, dzafman!users.noreply.github.com
 	Red Hat Inc.
 dzannotti: d.zannotti!me.com
@@ -24062,15 +24074,3 @@ keyz: keyz!users.noreply.github.com, kz5!indiana.edu, root!keyanzhang.com
 	Independent from 2016-08-01 until 2017-04-01
 	Oculus from 2017-04-01 until 2019-03-01
 	Robinhood Financial LLC from 2019-03-01
-kf6nux: ben.zarzycki!pantheon.io
-	Tesla Inc . until 2015-08-01
-	Defie from 2015-08-01 until 2016-06-01
-	Pantheon from 2016-06-01
-kfarnung: kfarnung!microsoft.com, kfarnung!outlook.com
-	Microsoft Corporation
-kfaseela: k.faseela!gmail.com
-	Ericsson
-kfdm: kfdm!users.noreply.github.com, kungfudiscomonkey!gmail.com, paul.traylor!linecorp.com
-	Asianfanfics
-kfenner: kaspar.fenner!siemens.com
-	Siemens AG

developers_affiliations4.txt

@@ -5,6 +5,18 @@
 # 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.
+kf6nux: ben.zarzycki!pantheon.io
+	Tesla Inc . until 2015-08-01
+	Defie from 2015-08-01 until 2016-06-01
+	Pantheon from 2016-06-01
+kfarnung: kfarnung!microsoft.com, kfarnung!outlook.com
+	Microsoft Corporation
+kfaseela: k.faseela!gmail.com
+	Ericsson
+kfdm: kfdm!users.noreply.github.com, kungfudiscomonkey!gmail.com, paul.traylor!linecorp.com
+	Asianfanfics
+kfenner: kaspar.fenner!siemens.com
+	Siemens AG
 kferrone: kferrone!users.noreply.github.com
 	Tree-LineBuilders Inc. until 2015-11-01
 	Independent from 2015-11-01 until 2017-03-01
@@ -24071,15 +24083,3 @@ preichl: preichl!redhat.com
 	Red Hat Inc.
 preillyme: patrick!kismatic.io, preillyme!users.noreply.github.com
 	Kismatic
-prem-bfn: prem!barefootnetworks.com, prem-bfn!users.noreply.github.com
-	Broadcom Corporation until 2014-09-01
-	Barefoot Networks Inc. from 2014-09-01 until 2019-01-01
-	Ampere Computing from 2019-01-01 until 2019-05-01
-	Barefoot Networks Inc. from 2019-05-01
-premanandc: premanandc!gmail.com, premanandc!users.noreply.github.com
-	ThoughtWorks Inc until 2015-06-15
-	Barclaycard from 2015-06-15
-premist: premist!me.com, premist!users.noreply.github.com
-	Shakr
-premkarat: pkarat!mvista.com
-	MontaVista Software LLC

developers_affiliations5.txt

@@ -5,6 +5,18 @@
 # 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.
+prem-bfn: prem!barefootnetworks.com, prem-bfn!users.noreply.github.com
+	Broadcom Corporation until 2014-09-01
+	Barefoot Networks Inc. from 2014-09-01 until 2019-01-01
+	Ampere Computing from 2019-01-01 until 2019-05-01
+	Barefoot Networks Inc. from 2019-05-01
+premanandc: premanandc!gmail.com, premanandc!users.noreply.github.com
+	ThoughtWorks Inc until 2015-06-15
+	Barclaycard from 2015-06-15
+premist: premist!me.com, premist!users.noreply.github.com
+	Shakr
+premkarat: pkarat!mvista.com
+	MontaVista Software LLC
 premkumar-gg: premkumar-gg!users.noreply.github.com
 	fosh.io until 2016-05-01
 	giffgaff from 2016-05-01
@@ -24063,17 +24075,3 @@ visualapps: rakesh.singh!mayadata.io, visualapps!users.noreply.github.com
 visualphoenix: raymond.barbiero.dev!gmail.com, visualphoenix!users.noreply.github.com
 	YP until 2017-03-01
 	Stealth Mode Startup Company from 2017-03-01
-viswanav: vasanth.viswanathan!hpe.com
-	HP Inc.
-vit100: vit100!users.noreply.github.com
-	Automatic Data Processing Inc. (ADP) until 2015-12-01
-	Finastra from 2015-12-01
-vital987: vital987!users.noreply.github.com
-	Independent
-vitali-shcharbin: vitali-shcharbin!users.noreply.github.com
-	EPAM Systems Inc until 2019-10-01
-	Apple Inc. from 2019-10-01
-vitali87: eheva87!gmail.com
-	Independent until 2019-03-01
-	Air Products from 2019-03-01 until 2021-12-01
-	TurinTech AI from 2021-12-01

developers_affiliations6.txt

@@ -5,6 +5,20 @@
 # 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.
+viswanav: vasanth.viswanathan!hpe.com
+	HP Inc.
+vit100: vit100!users.noreply.github.com
+	Automatic Data Processing Inc. (ADP) until 2015-12-01
+	Finastra from 2015-12-01
+vital987: vital987!users.noreply.github.com
+	Independent
+vitali-shcharbin: vitali-shcharbin!users.noreply.github.com
+	EPAM Systems Inc until 2019-10-01
+	Apple Inc. from 2019-10-01
+vitali87: eheva87!gmail.com
+	Independent until 2019-03-01
+	Air Products from 2019-03-01 until 2021-12-01
+	TurinTech AI from 2021-12-01
 vitalii-stoian: vit.stoyan!gmail.com, vitalii-stoian!users.noreply.github.com
 	PlanetScale
 vitaliy-leschenko: v.leschenko!vitaliy.org, vitaliy-leschenko!users.noreply.github.com

src/cncf-config/email-map

@@ -3604,6 +3604,7 @@ RussKeldorph!users.noreply.github.com Microsoft Corporation
 RussKie!users.noreply.github.com Microsoft Corporation
 RyanDawkins!users.noreply.github.com Amazon
 RyanMcG!users.noreply.github.com Lyft Inc.
+RyanZhaoXB!users.noreply.github.com Huawei Technologies Co. Ltd
 S-ayanide!users.noreply.github.com ChaosNative
 S-ayanide!users.noreply.github.com Independent < 2019-07-01
 S-ayanide!users.noreply.github.com Independent < 2020-04-01
@@ -127966,6 +127967,7 @@ zhaonian!users.noreply.github.com Google LLC
 zhaopeng1988!gmail.com Hyper
 zhaopeng1988!gmail.com VisualOps < 2015-12-01
 zhaoqin!cn.ibm.com International Business Machines Corporation
+zhaor_thu!163.com Huawei Technologies Co. Ltd
 zhaorenming!inspur.com Inspur Group
 zhaoshan!inspur.com Inspur Group
 zhaoshan86!126.com Inspur Group

src/input.diff

@@ -1,14 +1,13 @@
 diff --git a/developers_affiliations1.txt b/developers_affiliations1.txt
-index 1d53f65d..b751272e 100644
+index 1d53f65d..72dedccc 100644
 --- a/developers_affiliations1.txt
 +++ b/developers_affiliations1.txt
-@@ -1565,6 +1565,9 @@ Andrea-Campanella: andrea!onlab.us, andrea!opennetworking.org, andrea.campanella
- 	Independent until 2015-10-01
- 	ON.Lab from 2015-10-01 until 2017-12-01
- 	Open Networking Foundation from 2017-12-01
-+AndreaDecorte: andreadecorte!users.noreply.github.com, klenje!users.noreply.github.com, adecorte!gmail.com
-+	Independent until 2016-01-04
-+	Amadeus from 2016-01-04
- AndreaGiardini: andrea.giardini!camunda.com, andreagiardini!users.noreply.github.com
- 	CERN until 2015-11-01
- 	Independent from 2015-11-01 until 2017-02-01
+@@ -14771,6 +14771,8 @@ RyanW8: RyanW8!users.noreply.github.com
+ 	Node4 from 2017-11-01 until 2020-01-01
+ 	Telent from 2020-01-01 until 2020-03-01
+ 	Nutmeg from 2020-03-01
++RyanZhaoXB: zhaor_thu!163.com, RyanZhaoXB!users.noreply.github.com
++	Huawei Technologies Co. Ltd
+ RyanZim: opensrc!ryanzim.com, ryanzim!users.noreply.github.com
+ 	Independent
+ Ryceancurry: justinpopo6!gmail.com