Post merge updates

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

Author: lukaszgryglicki

company_developers1.txt

@@ -2659,7 +2659,6 @@ Alianza:
 	kentcdodds: kent!doddsfamily.us, kent+github!doddsfamily.us, kentcdodds!users.noreply.github.com from 2014-10-01 until 2015-12-01
 	tjmcarthur: tjmcarthur!users.noreply.github.com, troyjohn.mcarthur!gmail.com from 2017-04-01
 Alibaba:
-	kadisi: iamkadisi!163.com, kadisi!users.noreply.github.com
 	Ace-Tang: Ace-Tang!users.noreply.github.com, aceapril!126.com
 	AdoHe: AdoHe!users.noreply.github.com, coolhzb!gmail.com
 	Alienero: Alienero!users.noreply.github.com, yiyan.lu!me.com
@@ -2733,6 +2732,7 @@ Alibaba:
 	justdoitqd: wei.guo.simon!gmail.com from 2018-08-01
 	jzwlqx: jiangjizhong!gmail.com, jiangjizhong#gmail.com, jzwlqx!users.noreply.github.com
 	k2huang: k2huang!users.noreply.github.com
+	kadisi: iamkadisi!163.com, kadisi!users.noreply.github.com from 2020-09-10
 	kiwenlau: 798047000!qq.com, etienne.delclaux!outlook.com, kiwenlau!126.com, kiwenlau!users.noreply.github.com from 2020-07-01
 	liupan1111: liupan1111!users.noreply.github.com, pan.liu!istuary.com, wanjun.lp!alibaba-inc.com
 	liutongxuan: tongxuan.ltx!alibaba-inc.com
@@ -11010,6 +11010,7 @@ Chaos Sci.:
 ChaosIQ:
 	Lawouach: Lawouach!users.noreply.github.com, sh!defuze.org from 2017-10-01
 ChaosNative:
+	S-ayanide: S-ayanide!users.noreply.github.com, sayan!chaosnative.com, sayan.mondal!mayadata.io, sayanmondal342!gmail.com from 2021-02-01
 	arkajyotiMukherjee: arkajyoti.mukherjee!mayadata.io, arkajyoti31!gmail.com, arkajyotiMukherjee!users.noreply.github.com, arko!chaosnative.com from 2021-02-01
 	ishangupta-ds: ishan!chaosnative.com, ishan.gupta!mayadata.io, ishangupta-ds!users.noreply.github.com, ishangupta.ds!gmail.com from 2021-02-01
 	rajdas98: mail.rajdas!gmail.com, raj!chaosnative.com, raj.das!mayadata.io, rajdas98!users.noreply.github.com from 2021-02-01
@@ -11249,6 +11250,7 @@ China Unicom:
 	YaohongZhang: yaozhongzyz!126.com
 	YaozhongZhang: yaozhongzyz!126.com
 	jiaj12: jiaj12!chinaunicom.cn, jiaj12!users.noreply.github.com
+	kadisi: iamkadisi!163.com, kadisi!users.noreply.github.com until 2020-09-10
 	kuramal: linxxnil!126.com
 	okzhchy: okzhchy!qq.com, okzhchy!users.noreply.github.com, zhangcy365!chinaunicom.cn
 	sailorvii: challengingway!hotmail.com, chenw66!chinaunicom.cn, sailorvii!users.noreply.github.com
@@ -16525,5 +16527,3 @@ Devexperts:
 	jingerbread: jingerbread!users.noreply.github.com, qwadrillion!gmail.com until 2014-10-01, from 2015-10-01 until 2017-11-01
 Deveyware:
 	a14n: a14n!users.noreply.github.com, alexandre.ardhuin!gmail.com
-Devguru:
-	marcushyungseoklee: marcushyungseoklee!users.noreply.github.com until 2016-01-01

company_developers2.txt

@@ -1,6 +1,8 @@
 # This file is derived from developers_affiliations.txt and so should not be edited directly.
 # If you see an error, please update developers_affiliations.txt and this file will be fixed
 # when regenerated.
+Devguru:
+	marcushyungseoklee: marcushyungseoklee!users.noreply.github.com until 2016-01-01
 Devhouse Spindle:
 	Luit: Luit!users.noreply.github.com, luitvd!gmail.com
 	c0deaddict: c0deaddict!users.noreply.github.com, jos!codeaddict.org from 2017-05-01

company_developers3.txt

@@ -976,7 +976,7 @@ Independent:
 	RyanMcG: RyanMcG!users.noreply.github.com, ryan!ryanmcg.com, sgupta1505!gmail.com from 2016-01-01 until 2016-03-01
 	RyanZim: opensrc!ryanzim.com, ryanzim!users.noreply.github.com
 	Ryceancurry: justinpopo6!gmail.com from 2016-02-01 until 2017-04-01
-	S-ayanide: sayan.mondal!mayadata.io until 2019-07-01, from 2019-09-01 until 2020-04-01
+	S-ayanide: S-ayanide!users.noreply.github.com, sayan!chaosnative.com, sayan.mondal!mayadata.io, sayanmondal342!gmail.com until 2019-07-01, from 2019-09-01 until 2020-04-01
 	SBhat35: sachit.s.bhat!vanderbilt.edu from 2016-05-01 until 2016-06-01, from 2016-08-01 until 2017-05-01, from 2017-08-01 until 2019-06-01
 	SEQUOIIA: sequoiia!hummel.yt until 2019-06-01
 	SMillerDev: SMillerDev!users.noreply.github.com from 2014-08-01 until 2015-09-01
@@ -12830,5 +12830,3 @@ Linux:
 	swinslow: swinslow!gmail.com, swinslow!users.noreply.github.com
 Linux Academy:
 	Chazzledazzle1: Chazzledazzle1!users.noreply.github.com, chaz!linuxacademy.com
-LinuxTV.org:
-	pboettch: patrick.boettcher!posteo.de from 2015-01-01 until 2016-03-01

company_developers4.txt

@@ -1,6 +1,8 @@
 # This file is derived from developers_affiliations.txt and so should not be edited directly.
 # If you see an error, please update developers_affiliations.txt and this file will be fixed
 # when regenerated.
+LinuxTV.org:
+	pboettch: patrick.boettcher!posteo.de from 2015-01-01 until 2016-03-01
 Linways:
 	sujeshthekkepatt: sujeshthekkepatt!gmail.com, sujeshthekkepatt!users.noreply.github.com from 2017-05-01 until 2017-12-01
 Linxo:
@@ -1895,7 +1897,7 @@ MayaData:
 	Moteesh: Moteesh!users.noreply.github.com, moteesh!gmail.com, romain.bonhomme89!gmail.com from 2017-12-01
 	NisantaSahoo: NisantaSahoo!users.noreply.github.com, nisanta.sahoo!mayadata.io from 2017-11-01
 	Pradeepkumarbk: Pradeepkumarbk!users.noreply.github.com, pradeep.kumar!mayadata.io, pradeepkumar.bk96!gmail.com from 2017-10-01
-	S-ayanide: sayan.mondal!mayadata.io from 2020-06-01
+	S-ayanide: S-ayanide!users.noreply.github.com, sayan!chaosnative.com, sayan.mondal!mayadata.io, sayanmondal342!gmail.com from 2020-06-01 until 2021-02-01
 	Sanjay1611: Sanjay1611!users.noreply.github.com from 2019-04-01
 	Saranya-jena: Saranya.jena!mayadata.io from 2020-05-02
 	ShovanMaity: ShovanMaity!users.noreply.github.com from 2017-11-01
@@ -3016,7 +3018,7 @@ Microsoft Corporation:
 	RohanNagar: RohanNagar!users.noreply.github.com, rohan.nagar!utexas.edu
 	RomanDzhabarov: RomanDzhabarov!users.noreply.github.com, rdzhabarov!lyft.com until 2014-05-01
 	Rouzbahan: joe!grdnr.io, rrashidi!ciena.com from 2017-09-01
-	S-ayanide: sayan.mondal!mayadata.io from 2020-04-01 until 2020-06-01
+	S-ayanide: S-ayanide!users.noreply.github.com, sayan!chaosnative.com, sayan.mondal!mayadata.io, sayanmondal342!gmail.com from 2020-04-01 until 2020-06-01
 	SGuyGe: sguyge!microsoft.com, sguyge!users.noreply.github.com until 2016-07-01
 	SajayAntony: SajayAntony!users.noreply.github.com
 	SanyaKochhar: SanyaKochhar!users.noreply.github.com from 2020-07-01
@@ -4932,7 +4934,7 @@ Mozilla:
 	Divya063: Divya063!users.noreply.github.com, ranidivya063!gmail.com from 2017-07-01 until 2017-10-01
 	Gozala: Gozala!users.noreply.github.com, rfobic!gmail.com
 	JohnLZeller: johnlzeller!gmail.com until 2014-09-01
-	S-ayanide: sayan.mondal!mayadata.io from 2019-07-01 until 2019-09-01
+	S-ayanide: S-ayanide!users.noreply.github.com, sayan!chaosnative.com, sayan.mondal!mayadata.io, sayanmondal342!gmail.com from 2019-07-01 until 2019-09-01
 	aerickson: aerickson!gmail.com, aerickson!users.noreply.github.com from 2019-01-01
 	ajvb: aj!ajvb.me
 	alexcrichton: alex!alexcrichton.com, alexcrichton!users.noreply.github.com

developers_affiliations1.txt

@@ -10072,7 +10072,7 @@ Rystakei: rystakei!gmail.com
 	Zipcar from 2014-07-01 until 2016-06-01
 	Vulk Coop from 2016-06-01 until 2017-08-01
 	Acquia Inc. from 2017-08-01
-S-ayanide: sayan.mondal!mayadata.io, sayan!chaosnative.com, sayanmondal342!gmail.com, S-ayanide!users.noreply.github.com
+S-ayanide: S-ayanide!users.noreply.github.com, sayan!chaosnative.com, sayan.mondal!mayadata.io, sayanmondal342!gmail.com
 	Independent until 2019-07-01
 	Mozilla from 2019-07-01 until 2019-09-01
 	Independent from 2019-09-01 until 2020-04-01
@@ -24353,8 +24353,3 @@ cagedmantis: cagedmantis!users.noreply.github.com, camedee!digitalocean.com
 caggles: caggles!users.noreply.github.com, cailey.jones!gov.bc.ca, jacek!migdal.pl, mrjackolai!gmail.com
 	PowerInbox until 2016-07-01
 	Independent from 2016-07-01
-cagiti: cagiti!users.noreply.github.com, caicooper82!gmail.com
-	Monitise plc is Fiserv until 2014-11-01
-	FINkit from 2014-11-01 until 2018-01-01
-	Fiserv Inc. from 2018-01-01 until 2019-02-01
-	CloudBees Inc. from 2019-02-01

developers_affiliations2.txt

@@ -5,6 +5,11 @@
 # 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.
+cagiti: cagiti!users.noreply.github.com, caicooper82!gmail.com
+	Monitise plc is Fiserv until 2014-11-01
+	FINkit from 2014-11-01 until 2018-01-01
+	Fiserv Inc. from 2018-01-01 until 2019-02-01
+	CloudBees Inc. from 2019-02-01
 caglar10ur: caglar!10ur.org, caglar!digitalocean.com, caglar10ur!users.noreply.github.com
 	Akamai Technologies Inc. until 2015-07-01
 	VMware Inc. from 2015-07-01 until 2017-12-01
@@ -24707,8 +24712,3 @@ jon-walton: jon-walton!users.noreply.github.com
 	Better Loyalty from 2017-05-01 until 2018-06-01
 	Independent from 2018-06-01 until 2018-08-01
 	PLAYSTUDIOS from 2018-08-01
-jon-whit: jon-whit!users.noreply.github.com, jon.b.whitaker!gmail.com
-	Independent until 2015-05-01
-	Plexus from 2015-05-01 until 2017-12-01
-	Solutionreach from 2017-12-01 until 2020-02-01
-	Independent from 2020-02-01

developers_affiliations3.txt

@@ -5,6 +5,11 @@
 # 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.
+jon-whit: jon-whit!users.noreply.github.com, jon.b.whitaker!gmail.com
+	Independent until 2015-05-01
+	Plexus from 2015-05-01 until 2017-12-01
+	Solutionreach from 2017-12-01 until 2020-02-01
+	Independent from 2020-02-01
 jonahbron: jonah!jonah.name, jonahbron!users.noreply.github.com
 	Nucleus until 2015-03-01
 	Limelight Health from 2015-03-01
@@ -2059,6 +2064,7 @@ kadimi: kadimi!users.noreply.github.com, nabil!kadimi.com
 	Codeable from 2015-03-01 until 2018-01-01
 	ThemeBoy from 2018-01-01
 kadisi: iamkadisi!163.com, kadisi!users.noreply.github.com
+	China Unicom until 2020-09-10
 	Alibaba from 2020-09-10
 kaduk: bkaduk!akamai.com
 	Akamai Technologies Inc.
@@ -24739,10 +24745,3 @@ rob-ward: robert.ward114!googlemail.com
 	Morgan Stanley from 2018-03-01
 robamaton: jdsutherland3!gmail.com, robamaton!users.noreply.github.com
 	athenahealth Inc.
-robbat2: robbat2!gentoo.org, robbat2!orbis-terrarum.net, robbat2!users.noreply.github.com, robin.johnson!dreamhost.com
-	Independent
-robbie-demuth: robbie-demuth!users.noreply.github.com, robbie.demuth!appian.com
-	L'Hirondelle until 2014-08-01
-	Independent from 2014-08-01 until 2015-06-01
-	Northrop Grumman from 2015-06-01 until 2015-08-01
-	Independent from 2015-08-01

developers_affiliations4.txt

@@ -5,6 +5,13 @@
 # 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.
+robbat2: robbat2!gentoo.org, robbat2!orbis-terrarum.net, robbat2!users.noreply.github.com, robin.johnson!dreamhost.com
+	Independent
+robbie-demuth: robbie-demuth!users.noreply.github.com, robbie.demuth!appian.com
+	L'Hirondelle until 2014-08-01
+	Independent from 2014-08-01 until 2015-06-01
+	Northrop Grumman from 2015-06-01 until 2015-08-01
+	Independent from 2015-08-01
 robbiemcmichael: robbiemcmichael!users.noreply.github.com
 	Arup until 2016-06-01
 	Commonwealth Bank from 2016-06-01

src/cncf-config/email-map

@@ -3198,6 +3198,12 @@ 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
+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
+S-ayanide!users.noreply.github.com MayaData < 2021-02-01
+S-ayanide!users.noreply.github.com Microsoft Corporation < 2020-06-01
+S-ayanide!users.noreply.github.com Mozilla < 2019-09-01
 SAPessi!users.noreply.github.com Amazon
 SARAN-thala!users.noreply.github.com ThoughtWorks
 SARAVANA1501!users.noreply.github.com ThoughtWorks
@@ -39976,7 +39982,8 @@ iamexile!gmail.com Stack Builders
 iamgd67!sina.com Sina
 iamjoonsoo.kim!lge.com Diversability
 iamjoonsoo.kim!lge.com Independent < 2018-07-01
-iamkadisi!163.com China Unicom
+iamkadisi!163.com Alibaba
+iamkadisi!163.com China Unicom < 2020-09-10
 iamljj!gmail.com UnitedStack
 iamonkara!users.noreply.github.com NotFound
 iampiyush!users.noreply.github.com Samsung Electronics Co. Ltd.
@@ -49693,7 +49700,8 @@ kadern0!users.noreply.github.com Qualtrics < 2019-10-01
 kadern0!users.noreply.github.com Wargaming
 kadern0!users.noreply.github.com mAdme < 2018-03-01
 kadishmal!users.noreply.github.com Amazon
-kadisi!users.noreply.github.com China Unicom
+kadisi!users.noreply.github.com Alibaba
+kadisi!users.noreply.github.com China Unicom < 2020-09-10
 kadler!thoughtworks.com ThoughtWorks
 kaelig!users.noreply.github.com Shopify
 kaelr!microsoft.com Microsoft Corporation
@@ -80454,16 +80462,29 @@ sayak.bugsmith!gmail.com Red Hat
 sayakmukhopadhyay!users.noreply.github.com Beez Innovation
 sayakmukhopadhyay!users.noreply.github.com Independent < 2015-07-01
 sayakmukhopadhyay!users.noreply.github.com Infosys < 2019-04-01
+sayan!chaosnative.com ChaosNative
+sayan!chaosnative.com Independent < 2019-07-01
+sayan!chaosnative.com Independent < 2020-04-01
+sayan!chaosnative.com MayaData < 2021-02-01
+sayan!chaosnative.com Microsoft Corporation < 2020-06-01
+sayan!chaosnative.com Mozilla < 2019-09-01
 sayan.chowdhury2012!gmail.com Red Hat
 sayan.mnit!gmail.com Independent
+sayan.mondal!mayadata.io ChaosNative
 sayan.mondal!mayadata.io Independent < 2019-07-01
 sayan.mondal!mayadata.io Independent < 2020-04-01
-sayan.mondal!mayadata.io MayaData
+sayan.mondal!mayadata.io MayaData < 2021-02-01
 sayan.mondal!mayadata.io Microsoft Corporation < 2020-06-01
 sayan.mondal!mayadata.io Mozilla < 2019-09-01
 sayanarijit!gmail.com Independent
 sayanchowdhury!users.noreply.github.com Red Hat
 sayanh!users.noreply.github.com Independent
+sayanmondal342!gmail.com ChaosNative
+sayanmondal342!gmail.com Independent < 2019-07-01
+sayanmondal342!gmail.com Independent < 2020-04-01
+sayanmondal342!gmail.com MayaData < 2021-02-01
+sayanmondal342!gmail.com Microsoft Corporation < 2020-06-01
+sayanmondal342!gmail.com Mozilla < 2019-09-01
 sayantani.goswami!intel.com Intel
 sayatez!gmail.com, stb!satybald.com GreenApple
 sayboras!yahoo.com Cilium

src/github_users.json

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6780abb03f59e7054c0895f74f224b56524dd7c770258b4815b068064e63c1b3
-size 66978197
+oid sha256:f43c5c95a26e04cf8146d932f3c155adfe1e8f65588682e7bc10900b105bb9c7
+size 66979340