Post merge update

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

Author: lukaszgryglicki

company_developers1.txt

@@ -11010,6 +11010,7 @@ ChaosIQ:
 	Lawouach: Lawouach!users.noreply.github.com, sh!defuze.org from 2017-10-01
 ChaosNative:
 	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
 Chaotic Moon Studios:
 	jeremytanner: jeremytanner!users.noreply.github.com until 2014-01-01
@@ -16526,9 +16527,3 @@ Deveyware:
 	a14n: a14n!users.noreply.github.com, alexandre.ardhuin!gmail.com
 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
-	hbokh: hbokh!users.noreply.github.com, hbokhoven!gmail.com
-Devialet:
-	drasko: drasko!users.noreply.github.com, drasko.draskovic!gmail.com until 2014-09-01

company_developers2.txt

@@ -1,6 +1,12 @@
 # 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.
+Devhouse Spindle:
+	Luit: Luit!users.noreply.github.com, luitvd!gmail.com
+	c0deaddict: c0deaddict!users.noreply.github.com, jos!codeaddict.org from 2017-05-01
+	hbokh: hbokh!users.noreply.github.com, hbokhoven!gmail.com
+Devialet:
+	drasko: drasko!users.noreply.github.com, drasko.draskovic!gmail.com until 2014-09-01
 DeviantArt:
 	banks: banks!users.noreply.github.com until 2016-04-01
 Deviatel:
@@ -8270,7 +8276,7 @@ Google:
 	invino4: invino4!users.noreply.github.com, jthunter!google.com
 	isaacl: isaac.r.levy!gmail.com, isaacl!users.noreply.github.com until 2014-08-01
 	isdal: isdal!users.noreply.github.com, tomas.isdal!gmail.com
-	ishangupta-ds: ishan.gupta!mayadata.io from 2019-04-01 until 2020-05-01
+	ishangupta-ds: ishan!chaosnative.com, ishan.gupta!mayadata.io, ishangupta-ds!users.noreply.github.com, ishangupta.ds!gmail.com from 2019-04-01 until 2020-05-01
 	ismailbaskin: ismailbaskin!users.noreply.github.com, ismailbaskin5!gmail.com from 2018-04-01
 	isturdy: isturdy!users.noreply.github.com, sturdy!google.com
 	isyun: yunliu!google.com
@@ -11161,7 +11167,7 @@ Help.com:
 	dkoston: dave!helixstream.com, dkoston!users.noreply.github.com from 2015-10-01 until 2017-10-01
 	evanlucas: evanlucas!me.com, evanlucas!users.noreply.github.com from 2015-06-01 until 2020-03-01
 HelpAge:
-	ishangupta-ds: ishan.gupta!mayadata.io from 2015-01-01 until 2015-03-01
+	ishangupta-ds: ishan!chaosnative.com, ishan.gupta!mayadata.io, ishangupta-ds!users.noreply.github.com, ishangupta.ds!gmail.com from 2015-01-01 until 2015-03-01
 HelpSystems:
 	daverick: daverick!users.noreply.github.com, daverick.in.bcn!gmail.com, daverick.inb.cn+github!gmail.com until 2016-03-01
 Helpful:

company_developers3.txt

@@ -3587,7 +3587,7 @@ Independent:
 	isa-bel: isa-bel!users.noreply.github.com, isabel.xkjc!gmail.com
 	isaacl: isaac.r.levy!gmail.com, isaacl!users.noreply.github.com from 2014-08-01 until 2014-11-01
 	ishanarora: ishan.arora!keacodes.com from 2019-05-01 until 2019-08-01
-	ishangupta-ds: ishan.gupta!mayadata.io until 2015-01-01, from 2015-03-01 until 2018-01-01, from 2018-12-01 until 2019-02-01
+	ishangupta-ds: ishan!chaosnative.com, ishan.gupta!mayadata.io, ishangupta-ds!users.noreply.github.com, ishangupta.ds!gmail.com until 2015-01-01, from 2015-03-01 until 2018-01-01, from 2018-12-01 until 2019-02-01
 	ishankhare07: ishankhare07!gmail.com, ishankhare07!users.noreply.github.com until 2015-06-01, from 2015-08-01 until 2016-07-01, from 2017-11-01 until 2018-04-01
 	ishantanu: ishantanu!users.noreply.github.com, shantanud106!gmail.com until 2015-09-01
 	ishbir: ishbir!users.noreply.github.com until 2015-03-01, from 2015-08-01 until 2017-03-01, from 2017-08-01 until 2018-02-01
@@ -12832,5 +12832,3 @@ 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
-Linways:
-	sujeshthekkepatt: sujeshthekkepatt!gmail.com, sujeshthekkepatt!users.noreply.github.com from 2017-05-01 until 2017-12-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.
+Linways:
+	sujeshthekkepatt: sujeshthekkepatt!gmail.com, sujeshthekkepatt!users.noreply.github.com from 2017-05-01 until 2017-12-01
 Linxo:
 	acartapanis: acartapanis!users.noreply.github.com, alexandre.cartapanis!gmail.com from 2017-06-01
 Liqid Labs:
@@ -1923,7 +1925,7 @@ MayaData:
 	imazik: imazik!users.noreply.github.com, shovan.cse91!gmail.com, shovan.maity!mayadata.io from 2017-11-01
 	inyee786: intakhab.ali!mayadata.io, intakhab.cusat!gmail.com, inyee786!users.noreply.github.com from 2017-09-01
 	is-ashish: ashishjainjnp18!gmail.com from 2019-11-01
-	ishangupta-ds: ishan.gupta!mayadata.io from 2020-05-01
+	ishangupta-ds: ishan!chaosnative.com, ishan.gupta!mayadata.io, ishangupta-ds!users.noreply.github.com, ishangupta.ds!gmail.com from 2020-05-01 until 2021-02-01
 	ispeakc0de: ispeakc0de!users.noreply.github.com, shubham.chaudhary!mayadata.io from 2019-06-01
 	jkryl: jan.kryl!cloudbyte.com, jan.kryl!mayadata.io, jkryl!users.noreply.github.com from 2017-12-01
 	jonathan-teh: 30538043+jonathan-teh!users.noreply.github.com, jonathan-teh!users.noreply.github.com, jonathan.teh!mayadata.io

company_developers5.txt

@@ -11821,7 +11821,7 @@ Thingful:
 Think:
 	aerostitch: aerostitch!debian.org, aerostitch!users.noreply.github.com, herlantj!gmail.com from 2014-07-01 until 2014-10-01
 Think India:
-	ishangupta-ds: ishan.gupta!mayadata.io from 2018-03-01 until 2018-12-01
+	ishangupta-ds: ishan!chaosnative.com, ishan.gupta!mayadata.io, ishangupta-ds!users.noreply.github.com, ishangupta.ds!gmail.com from 2018-03-01 until 2018-12-01
 Think Research:
 	roy-tonal: roy-tonal!users.noreply.github.com from 2019-02-01 until 2020-08-01
 Think360.ai:
@@ -15790,7 +15790,7 @@ Videal:
 	ellenaua: elena.waverley!gmail.com, elenasharovar!gmail.com, ellenaua!users.noreply.github.com until 2015-12-01
 	serrss: 35063062+serrss!users.noreply.github.com, sergey.romanov.kh!gmail.com, serrss!users.noreply.github.com until 2015-12-01
 Viden.io:
-	ishangupta-ds: ishan.gupta!mayadata.io from 2019-02-01 until 2019-04-01
+	ishangupta-ds: ishan!chaosnative.com, ishan.gupta!mayadata.io, ishangupta-ds!users.noreply.github.com, ishangupta.ds!gmail.com from 2019-02-01 until 2019-04-01
 Video Village:
 	daryllstrauss: daryllstrauss!users.noreply.github.com from 2019-01-01
 VideoFruit:
@@ -16342,7 +16342,3 @@ Voxy:
 	wyattanderson: wanderson!gmail.com until 2014-07-01
 Voyager:
 	charliewhitfield: charliewhitfield!users.noreply.github.com
-Voyalab:
-	voyalab: voyalab!users.noreply.github.com
-Vpon Big Data Group:
-	roackb2: lpesic88!gmail.com, roackb2!users.noreply.github.com from 2015-09-01 until 2016-01-01

company_developers6.txt

@@ -1,6 +1,10 @@
 # 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.
+Voyalab:
+	voyalab: voyalab!users.noreply.github.com
+Vpon Big Data Group:
+	roackb2: lpesic88!gmail.com, roackb2!users.noreply.github.com from 2015-09-01 until 2016-01-01
 Vrbo:
 	gnz00: gnz00!users.noreply.github.com from 2018-06-01 until 2019-10-01
 Vreal:
@@ -500,7 +504,7 @@ Weaveworks:
 	D3nn: D3nn!users.noreply.github.com, dann.church!gmail.com from 2018-11-05
 	Eochs: Eochs!users.noreply.github.com, slochastic!gmail.com from 2017-12-01 until 2018-12-01
 	LiliC: LiliC!users.noreply.github.com, cosiclili!gmail.com from 2018-04-01 until 2018-09-01
-	SomtochiAma: SomtochiAma!users.noreply.github.com, somtochionyekwere!gmail.com
+	SomtochiAma: SomtochiAma!users.noreply.github.com, somtochi!users.noreply.github.com, somtochi!weave.works, somtochionyekwere!gmail.com
 	aaron7: aaron!aaronkirkbride.com, aaron7!users.noreply.github.com from 2017-04-01 until 2018-09-01
 	abuehrle: abuehrle!users.noreply.github.com, anita!weave.works from 2015-07-01
 	alisondy: alison!alisondowdney.com, alison!weave.works, alisondy!users.noreply.github.com from 2019-06-01
@@ -2219,7 +2223,7 @@ Yoink:
 Yokel:
 	oms4suse: osynge!suse.com from 2017-02-01
 Yoken:
-	ishangupta-ds: ishan.gupta!mayadata.io from 2018-01-01 until 2018-03-01
+	ishangupta-ds: ishan!chaosnative.com, ishan.gupta!mayadata.io, ishangupta-ds!users.noreply.github.com, ishangupta.ds!gmail.com from 2018-01-01 until 2018-03-01
 Yola.com:
 	bearnard: bearnard!gmail.com, bearnard!users.noreply.github.com
 Yolt:

developers_affiliations1.txt

@@ -10762,7 +10762,7 @@ SomeKittens: !rkoutnik, SomeKittens!users.noreply.github.com, rkoutnik!gmail.com
 	Norse from 2015-06-01 until 2016-02-01
 	Netflix from 2016-02-01 until 2018-06-01
 	Slack from 2018-06-01
-SomtochiAma: SomtochiAma!users.noreply.github.com, somtochionyekwere!gmail.com
+SomtochiAma: SomtochiAma!users.noreply.github.com, somtochi!users.noreply.github.com, somtochi!weave.works, somtochionyekwere!gmail.com
 	Weaveworks
 SongGithub: SongGithub!users.noreply.github.com, songjin!hotmail.com
 	Icon until 2016-02-01

developers_affiliations2.txt

@@ -20254,7 +20254,7 @@ ishanarora: ishan.arora!keacodes.com
 	Bulwark Partners until 2019-05-01
 	Independent from 2019-05-01 until 2019-08-01
 	Kea Codes from 2019-08-01
-ishangupta-ds: ishan.gupta!mayadata.io
+ishangupta-ds: ishan!chaosnative.com, ishan.gupta!mayadata.io, ishangupta-ds!users.noreply.github.com, ishangupta.ds!gmail.com
 	Independent until 2015-01-01
 	HelpAge from 2015-01-01 until 2015-03-01
 	Independent from 2015-03-01 until 2018-01-01
@@ -20263,7 +20263,8 @@ ishangupta-ds: ishan.gupta!mayadata.io
 	Independent from 2018-12-01 until 2019-02-01
 	Viden.io from 2019-02-01 until 2019-04-01
 	Google from 2019-04-01 until 2020-05-01
-	MayaData from 2020-05-01
+	MayaData from 2020-05-01 until 2021-02-01
+	ChaosNative from 2021-02-01
 ishankhare07: ishankhare07!gmail.com, ishankhare07!users.noreply.github.com
 	Independent until 2015-06-01
 	Codemancers from 2015-06-01 until 2015-08-01
@@ -24711,6 +24712,3 @@ jon-whit: jon-whit!users.noreply.github.com, jon.b.whitaker!gmail.com
 	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

developers_affiliations3.txt

@@ -5,6 +5,9 @@
 # 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.
+jonahbron: jonah!jonah.name, jonahbron!users.noreply.github.com
+	Nucleus until 2015-03-01
+	Limelight Health from 2015-03-01
 jonahjon: jonahjo!amazon.com, jonahjon!users.noreply.github.com
 	Independent until 2016-05-01
 	Wayfair from 2016-05-01 until 2016-08-01
@@ -24743,6 +24746,3 @@ robbie-demuth: robbie-demuth!users.noreply.github.com, robbie.demuth!appian.com
 	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

developers_affiliations4.txt

@@ -5,6 +5,9 @@
 # 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.
+robbiemcmichael: robbiemcmichael!users.noreply.github.com
+	Arup until 2016-06-01
+	Commonwealth Bank from 2016-06-01
 robbiet480: me!robbiet.us, robbiet480!users.noreply.github.com
 	Gyroscope Innovations
 robbiezhang: junjiez!microsoft.com, robbiezhang!users.noreply.github.com
@@ -6132,8 +6135,6 @@ somesh2905: somesh2905!users.noreply.github.com
 somnathr: somnath.roy!sandisk.com
 	SanDisk until 2017-06-01
 	Samsung Electronics Co. Ltd. from 2017-06-01
-somtochiama: somtochionyekwere!gmail.com, somtochi!weave.works, somtochi!users.noreply.github.com
-	Weaveworks
 sonant: sonant!users.noreply.github.com
 	Acsour until 2017-05-01
 	Reksoft from 2017-05-01 until 2019-05-01

src/cncf-config/email-map

@@ -41336,18 +41336,49 @@ ishabalin!ninthdecimal.com NotFound
 ishadave!users.noreply.github.com NotFound
 ishakhat!mirantis.com Huawei Technologies Co. Ltd.
 ishakhat!mirantis.com Mirantis Inc. < 2017-05-31
+ishan!chaosnative.com ChaosNative
+ishan!chaosnative.com Google < 2020-05-01
+ishan!chaosnative.com HelpAge < 2015-03-01
+ishan!chaosnative.com Independent < 2015-01-01
+ishan!chaosnative.com Independent < 2018-01-01
+ishan!chaosnative.com Independent < 2019-02-01
+ishan!chaosnative.com MayaData < 2021-02-01
+ishan!chaosnative.com Think India < 2018-12-01
+ishan!chaosnative.com Viden.io < 2019-04-01
+ishan!chaosnative.com Yoken < 2018-03-01
 ishan.arora!keacodes.com Bulwark Partners < 2019-05-01
 ishan.arora!keacodes.com Independent < 2019-08-01
 ishan.arora!keacodes.com Kea Codes
+ishan.gupta!mayadata.io ChaosNative
 ishan.gupta!mayadata.io Google < 2020-05-01
 ishan.gupta!mayadata.io HelpAge < 2015-03-01
 ishan.gupta!mayadata.io Independent < 2015-01-01
 ishan.gupta!mayadata.io Independent < 2018-01-01
 ishan.gupta!mayadata.io Independent < 2019-02-01
-ishan.gupta!mayadata.io MayaData
+ishan.gupta!mayadata.io MayaData < 2021-02-01
 ishan.gupta!mayadata.io Think India < 2018-12-01
 ishan.gupta!mayadata.io Viden.io < 2019-04-01
 ishan.gupta!mayadata.io Yoken < 2018-03-01
+ishangupta-ds!users.noreply.github.com ChaosNative
+ishangupta-ds!users.noreply.github.com Google < 2020-05-01
+ishangupta-ds!users.noreply.github.com HelpAge < 2015-03-01
+ishangupta-ds!users.noreply.github.com Independent < 2015-01-01
+ishangupta-ds!users.noreply.github.com Independent < 2018-01-01
+ishangupta-ds!users.noreply.github.com Independent < 2019-02-01
+ishangupta-ds!users.noreply.github.com MayaData < 2021-02-01
+ishangupta-ds!users.noreply.github.com Think India < 2018-12-01
+ishangupta-ds!users.noreply.github.com Viden.io < 2019-04-01
+ishangupta-ds!users.noreply.github.com Yoken < 2018-03-01
+ishangupta.ds!gmail.com ChaosNative
+ishangupta.ds!gmail.com Google < 2020-05-01
+ishangupta.ds!gmail.com HelpAge < 2015-03-01
+ishangupta.ds!gmail.com Independent < 2015-01-01
+ishangupta.ds!gmail.com Independent < 2018-01-01
+ishangupta.ds!gmail.com Independent < 2019-02-01
+ishangupta.ds!gmail.com MayaData < 2021-02-01
+ishangupta.ds!gmail.com Think India < 2018-12-01
+ishangupta.ds!gmail.com Viden.io < 2019-04-01
+ishangupta.ds!gmail.com Yoken < 2018-03-01
 ishankhare07!gmail.com Codemancers < 2015-08-01
 ishankhare07!gmail.com GOJEK
 ishankhare07!gmail.com Goibibo < 2020-02-01

src/github_users.json

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

src/input.diff

@@ -1,26 +1,13 @@
-diff --git a/developers_affiliations1.txt b/developers_affiliations1.txt
-index 50803ce8..ba35509d 100644
---- a/developers_affiliations1.txt
-+++ b/developers_affiliations1.txt
-@@ -21231,6 +21231,8 @@ be2net: suresh.reddy!broadcom.com
- 	Broadcom Corporation
- beadon: beadon!users.noreply.github.com, bryant.eadon!gmail.com
- 	Thomson Reuters Markets LLC
-+beanliu: bean.liu89!gmail.com, xliu2!atlassian.com
-+	Atlassian Inc. from 2019-08-19
- bearnard: bearnard!gmail.com, bearnard!users.noreply.github.com
- 	Yola.com
- bearproof: bearproof!users.noreply.github.com, development!advance-leap.com
 diff --git a/developers_affiliations4.txt b/developers_affiliations4.txt
-index 5131230f..ce48cd5a 100644
+index e636dcb0..273b2a19 100644
 --- a/developers_affiliations4.txt
 +++ b/developers_affiliations4.txt
-@@ -16459,6 +16459,8 @@ wzliao: liaoweizhong!unionpay.com
- 	China UnionPay
- wzqnls: lishuo!caicloud.io, wzqnls!users.noreply.github.com
- 	Caicloud
-+wzshiming: wzshiming!foxmail.com, me!zsm.io, shiming.zhang!daocloud.io
-+	DaoCloud (Shanghai DaoCloud Network Technology Co LTD)
- wzssyqa: syq!debian.org
- 	Debian
- wzyy2: jacob-chen!iotwrt.com, jacob2.chen!rock-chips.com
+@@ -6132,6 +6132,8 @@ somesh2905: somesh2905!users.noreply.github.com
+ somnathr: somnath.roy!sandisk.com
+ 	SanDisk until 2017-06-01
+ 	Samsung Electronics Co. Ltd. from 2017-06-01
++somtochiama: somtochionyekwere!gmail.com, somtochi!weave.works, somtochi!users.noreply.github.com
++	Weaveworks
+ sonant: sonant!users.noreply.github.com
+ 	Acsour until 2017-05-01
+ 	Reksoft from 2017-05-01 until 2019-05-01