Post merge updates

Signed-off-by: Łukasz Gryglicki <[email protected]>
intuibase · Apr 8, 2024 · 75092a0 · 75092a0
1 parent 4392e8a
commit 75092a0
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 32 deletions.
diff --git a/company_developers1.txt b/company_developers1.txt
@@ -6347,6 +6347,7 @@ Alibaba Group:
 	siyuan0322: siyuan0322!gmail.com, siyuan0322!users.noreply.github.com, siyuanzhang.zsy!alibaba-inc.com from 2018-11-01
 	sjha2048: sjha200000!gmail.com from 2019-06-01 until 2019-09-01
 	smallfish: max.zelinski!gmail.com, smallfish!users.noreply.github.com, smallfish.xy!gmail.com
+	steverao: steverao!users.noreply.github.com, zihaorao!126.com from 2021-06-03
 	stone-jin: 1520006273!qq.com
 	stonexer: shitianxin!gmail.com, stonexer!users.noreply.github.com
 	sunxiaoguang: sunxiaoguang!hoolai.com, sunxiaoguang!users.noreply.github.com, sunxiaoguang!zhihu.com
@@ -16231,5 +16232,3 @@ Bitwards:
 	nineunderground: nineunderground!users.noreply.github.com from 2017-07-01 until 2018-07-01
 Bitwise:
 	anssih: anssi.hannula!bitwise.fi, anssi.hannula!iki.fi
-Bitwise I:
-	chetanpdeshmukh: chetanpdeshmukh!users.noreply.github.com from 2017-06-01 until 2018-12-01
diff --git a/company_developers10.txt b/company_developers10.txt
@@ -5909,7 +5909,7 @@ VMware Inc.:
 	PeteLevineA: lpete!vmware.com
 	PetrMc: PetrMc!users.noreply.github.com until 2019-01-01
 	Priyankasaggu11929: Priyankasaggu11929!users.noreply.github.com, priyankasaggu11929!gmail.com from 2021-09-01 until 2022-12-01
-	PushkarJ: PushkarJ!users.noreply.github.com, pjoglekar!vmware.com, pujoglek!visa.com, pushkar.joglekar1789!gmail.com from 2021-03-01 until 2022-10-01
+	PushkarJ: PushkarJ!users.noreply.github.com, pjoglekar!vmware.com, pujoglek!visa.com, pushkar.joglekar1789!gmail.com, pushkarj.at.work!gmail.com from 2021-03-05 until 2022-10-04
 	RaduBerinde: RaduBerinde!users.noreply.github.com, radu!cockroachlabs.com, radu.berinde!gmail.com until 2015-12-01
 	RaghavRoy145: RaghavRoy145!users.noreply.github.com from 2022-01-01 until 2022-03-01
 	RamXX: RamXX!users.noreply.github.com until 2014-09-01, from 2019-12-01
@@ -8719,7 +8719,7 @@ Visa Inc.:
 	DeepikaDixit: DeepikaDixit!users.noreply.github.com from 2017-08-01 until 2020-04-01
 	MLHafizur: MLHafizur!users.noreply.github.com from 2021-05-01 until 2021-11-01
 	MatteoMori: MatteoMori!users.noreply.github.com from 2021-10-01
-	PushkarJ: PushkarJ!users.noreply.github.com, pjoglekar!vmware.com, pujoglek!visa.com, pushkar.joglekar1789!gmail.com from 2015-06-01 until 2021-03-01
+	PushkarJ: PushkarJ!users.noreply.github.com, pjoglekar!vmware.com, pujoglek!visa.com, pushkar.joglekar1789!gmail.com, pushkarj.at.work!gmail.com until 2021-03-05
 	Robert-Christensen-visa: Robert-Christensen-visa!users.noreply.github.com from 2017-06-01
 	VinodAnandan: VinodAnandan!users.noreply.github.com from 2018-03-01 until 2019-09-01
 	abhijeetnijampurkar: abhijeetnijampurkar!users.noreply.github.com from 2020-10-01

diff --git a/company_developers2.txt b/company_developers2.txt
@@ -2,6 +2,8 @@
 # If you see an error, please update developers_affiliations.txt and this file will be fixed
 # when regenerated.
 #be:
+Bitwise I:
+	chetanpdeshmukh: chetanpdeshmukh!users.noreply.github.com from 2017-06-01 until 2018-12-01
 Bity:
 	ptzianos: azash85!gmail.com, pavlos.tzianos!gmail.com, ptzianos!users.noreply.github.com from 2018-05-01 until 2018-12-01
 	roosemberth: roosemberth!gmail.com, roosemberth!users.noreply.github.com from 2017-12-01
@@ -13739,7 +13741,6 @@ Credit Exchange FinTech Solutions:
 Credit Karma Inc.:
 	Clemmy: Clemmy!users.noreply.github.com, clement.hoang24!gmail.com from 2017-12-01
 	Eochs: Eochs!users.noreply.github.com, slochastic!gmail.com from 2016-04-01 until 2017-08-01
-	PushkarJ: PushkarJ!users.noreply.github.com, pjoglekar!vmware.com, pujoglek!visa.com, pushkar.joglekar1789!gmail.com from 2022-10-01
 	davidcollom: davidcollom!users.noreply.github.com from 2019-07-01 until 2020-08-01
 	derektamsen: derektamsen!users.noreply.github.com from 2019-08-01 until 2020-07-01
 	dstynchula: dstynchula!users.noreply.github.com from 2019-04-01

diff --git a/company_developers4.txt b/company_developers4.txt
@@ -8588,6 +8588,7 @@ Hound Technology Inc. dba Honeycomb:
 	austinlparker: austin!ap2.io, austin!lightstep.com, austinlparker!gmail.com, austinlparker!users.noreply.github.com
 	bdarfler: bdarfler!gmail.com, bdarfler!users.noreply.github.com, bendarfler!honeycomb.io from 2020-11-01
 	cartermp: pcarter!fastmail.com, phcart!microsoft.com, phillip!honeycomb.io, phillipcarter!honeycomb.io from 2021-07-01
+	codeboten: alrex.boten!gmail.com, codeboten!users.noreply.github.com from 2024-02-16
 	fchikwekwe: faithchikwekwe!honeycomb.io, faithchikwekwe01!gmail.com, fchikwekwe!users.noreply.github.com, hello!faithchikwekwe.dev from 2022-11-28
 	irvingpop: irving!chef.io, irving!honeycomb.io, irvingpop!users.noreply.github.com from 2019-11-01
 	kentquirk: kentquirk!gmail.com, kentquirk!honeycomb.io, kentquirk!users.noreply.github.com from 2021-03-30

diff --git a/company_developers5.txt b/company_developers5.txt
@@ -2478,7 +2478,7 @@ Independent:
 	PurelyApplied: PurelyApplied!users.noreply.github.com until 2017-01-01, from 2019-06-01 until 2019-08-01
 	PurneswarPrasad: PurneswarPrasad!users.noreply.github.com
 	PurpleBooth: PurpleBooth!users.noreply.github.com from 2015-04-01 until 2015-10-01, from 2016-04-01 until 2016-07-01
-	PushkarJ: PushkarJ!users.noreply.github.com, pjoglekar!vmware.com, pujoglek!visa.com, pushkar.joglekar1789!gmail.com until 2015-06-01
+	PushkarJ: PushkarJ!users.noreply.github.com, pjoglekar!vmware.com, pujoglek!visa.com, pushkar.joglekar1789!gmail.com, pushkarj.at.work!gmail.com from 2022-10-04
 	PxyUp: PxyUp!users.noreply.github.com, tduble94!gmail.com from 2015-08-01 until 2016-01-01
 	PyvesB: PyvesB!users.noreply.github.com, PyvesDev!gmail.com from 2014-08-01 until 2015-06-01, from 2015-08-01 until 2016-09-01
 	QSchulz: q.schulz!gmail.com, quentin.schulz!bootlin.com, quentin.schulz!free-electrons.com until 2014-08-01
@@ -15044,6 +15044,7 @@ Independent:
 	stevenpitts: stevenpitts!users.noreply.github.com until 2019-11-01
 	steveodonovan: sodonovan!ie.ibm.com, stephen.odonovancs!gmail.com, steveodonovan!users.noreply.github.com until 2015-07-01
 	steveperry-53: seperry53!gmail.com, stevepe!google.com, steveperry-53!users.noreply.github.com from 2014-09-01 until 2015-04-01
+	steverao: steverao!users.noreply.github.com, zihaorao!126.com until 2021-06-03
 	steveyang95: steveyang95!users.noreply.github.com until 2015-05-01, from 2015-08-01 until 2016-01-01, from 2016-08-01 until 2017-01-01
 	stevezau: stevezau!gmail.com, stevezau!users.noreply.github.com from 2017-02-01 until 2017-05-01
 	stewartpark: hello!stewartjpark.com until 2015-12-01, from 2017-08-01 until 2018-05-01

diff --git a/developers_affiliations1.txt b/developers_affiliations1.txt
@@ -223,8 +223,6 @@
 	EPAM Systems Inc from 2019-08-01 until 2020-03-01
 	PartsTech from 2020-03-01 until 2021-08-01
 	Firebolt · from 2021-08-01
-steverao: steverao!users.noreply.github.com
-  	Alibaba Group from 2021-06-03
 123liuziming: 123liuziming!users.noreply.github.com
 	Independent until 2020-09-01
 	爱奇艺 · Internship from 2020-09-01 until 2021-03-01
@@ -21566,11 +21564,10 @@ PurpleBooth: PurpleBooth!users.noreply.github.com
 	Armakuni from 2019-11-01
 PurushottamHari: PurushottamHari!users.noreply.github.com, purhari!cisco.com
 	Cisco
-PushkarJ: PushkarJ!users.noreply.github.com, pjoglekar!vmware.com, pujoglek!visa.com, pushkar.joglekar1789!gmail.com
-	Independent until 2015-06-01
-	Visa Inc. from 2015-06-01 until 2021-03-01
-	VMware Inc. from 2021-03-01 until 2022-10-01
-	Credit Karma Inc. from 2022-10-01
+PushkarJ: PushkarJ!users.noreply.github.com, pjoglekar!vmware.com, pujoglek!visa.com, pushkar.joglekar1789!gmail.com, pushkarj.at.work!gmail.com
+	Visa Inc. until 2021-03-05
+	VMware Inc. from 2021-03-05 until 2022-10-04
+	Independent from 2022-10-04
 PushkarJambhlekar: pushkar.iit!gmail.com
 	NVIDIA Corporation until 2015-07-01
 	Microsoft Corporation from 2015-07-01 until 2016-11-01

diff --git a/developers_affiliations3.txt b/developers_affiliations3.txt
@@ -11263,7 +11263,7 @@ codeblooded: codeblooded!users.noreply.github.com
 	Independent from 2016-08-01
 codeboten: alrex.boten!gmail.com, codeboten!users.noreply.github.com
 	LightStep Inc. until 2024-02-16
-	Hound Technology Inc. dba Honeycomb from 2024-02-26
+	Hound Technology Inc. dba Honeycomb from 2024-02-16
 codebutler: eric!codebutler.com
 	Uber until 2017-09-01
 	Independent from 2017-09-01 until 2018-10-01
@@ -23677,5 +23677,3 @@ ebauman: eamon!eamonbauman.com, ebauman!users.noreply.github.com
 ebbeelsborg: ebbeelsborg!users.noreply.github.com, ee!blackwoodseven.com
 	Edlund A/S until 2016-09-15
 	Blackwood Seven A/S from 2016-09-15
-ebblake: eblake!redhat.com
-	Red Hat Inc.
diff --git a/developers_affiliations4.txt b/developers_affiliations4.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.
+ebblake: eblake!redhat.com
+	Red Hat Inc.
 ebd2: ebd2!users.noreply.github.com
 	Delphix until 2015-04-01
 	Independent from 2015-04-01 until 2015-08-01

diff --git a/developers_affiliations6.txt b/developers_affiliations6.txt
@@ -21634,10 +21634,6 @@ pururaj1908: pdave2!ncsu.edu, pururaj1908!users.noreply.github.com
 	Independent from 2019-07-01 until 2020-05-01
 	Polyapp from 2020-05-01 until 2020-08-01
 	Independent from 2020-08-01
-pushkarj: pujoglek!visa.com, pushkarj!users.noreply.github.com, [email protected], pjoglekar!vmware.com, pushkar.joglekar1789!gmail.com
-	Visa Inc. until 2021-03-05
-	VMware from 2021-03-08 until 2022-10-03
-	Independent from 2022-10-04
 pushm0v: pushm0v.development!gmail.com
 	PT QDC until 2014-09-01
 	GOJEK from 2014-09-01 until 2018-09-01

diff --git a/developers_affiliations7.txt b/developers_affiliations7.txt
@@ -17806,6 +17806,9 @@ steveperry-53: seperry53!gmail.com, stevepe!google.com, steveperry-53!users.nore
 	Google LLC from 2015-04-01
 steveprentice: prentice!cisco.com, steveprentice!gmail.com
 	Cisco
+steverao: steverao!users.noreply.github.com, zihaorao!126.com
+	Independent until 2021-06-03
+	Alibaba Group from 2021-06-03
 stevermeister: stevermeister!gmail.com, stevermeister!users.noreply.github.com
 	Daxx until 2014-01-01
 	Envion Software from 2014-01-01 until 2015-09-01
@@ -23843,7 +23846,3 @@ timmywil: 4timmywil!gmail.com, timmywil!users.noreply.github.com, timmywillisn!g
 	OpenTable until 2016-11-01
 	Independent from 2016-11-01 until 2016-12-01
 	Pylon ai from 2016-12-01
-timnon: timnon!users.noreply.github.com
-	International Business Machines Corporation until 2016-03-01
-	Independent from 2016-03-01 until 2016-07-01
-	Tamedia from 2016-07-01
diff --git a/developers_affiliations8.txt b/developers_affiliations8.txt
@@ -5,6 +5,10 @@
 # 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.
+timnon: timnon!users.noreply.github.com
+	International Business Machines Corporation until 2016-03-01
+	Independent from 2016-03-01 until 2016-07-01
+	Tamedia from 2016-07-01
 timo-klarshift: timo-klarshift!users.noreply.github.com, timofriedlberlin!gmail.com
 	Rocket until 2014-06-01
 	babelforce from 2014-06-01

diff --git a/src/cncf-config/email-map b/src/cncf-config/email-map
@@ -4980,7 +4980,7 @@ PurelyApplied!users.noreply.github.com Independent < 2019-08-01
 PurelyApplied!users.noreply.github.com Pivotal < 2019-06-01
 PurushottamHari!users.noreply.github.com Cisco
 PushkarJ!users.noreply.github.com Independent
-PushkarJ!users.noreply.github.com VMware < 2022-10-04
+PushkarJ!users.noreply.github.com VMware Inc. < 2022-10-04
 PushkarJ!users.noreply.github.com Visa Inc. < 2021-03-05
 PyoWonki!users.noreply.github.com Samsung SDS
 QeelinDarly!users.noreply.github.com Hangzhou Harmony Cloud Technology Co. Ltd.
@@ -136455,7 +136455,7 @@ pjo256!nyu.edu Tech@NYU < 2014-12-01
 pjo256!nyu.edu Vimeo Inc.
 pjo256!nyu.edu Yodle < 2018-10-01
 pjoglekar!vmware.com Independent
-pjoglekar!vmware.com VMware < 2022-10-04
+pjoglekar!vmware.com VMware Inc. < 2022-10-04
 pjoglekar!vmware.com Visa Inc. < 2021-03-05
 pjohnmeyer!gmail.com 1904labs < 2018-10-01
 pjohnmeyer!gmail.com Independent < 2016-11-01
@@ -138953,7 +138953,7 @@ puja108!gmail.com Giant Swarm GmbH
 puja108!users.noreply.github.com Giant Swarm GmbH
 pujie2!huawei.com Huawei Technologies Co. Ltd
 pujoglek!visa.com Independent
-pujoglek!visa.com VMware < 2022-10-04
+pujoglek!visa.com VMware Inc. < 2022-10-04
 pujoglek!visa.com Visa Inc. < 2021-03-05
 pukapukan!users.noreply.github.com Amazon
 pukkaone!users.noreply.github.com Independent
@@ -139099,13 +139099,13 @@ pushkar.iit!gmail.com Microsoft Corporation < 2016-11-01
 pushkar.iit!gmail.com NVIDIA Corporation
 pushkar.iit!gmail.com NVIDIA Corporation < 2015-07-01
 pushkar.joglekar1789!gmail.com Independent
-pushkar.joglekar1789!gmail.com VMware < 2022-10-04
+pushkar.joglekar1789!gmail.com VMware Inc. < 2022-10-04
 pushkar.joglekar1789!gmail.com Visa Inc. < 2021-03-05
 pushkar.nk!in.ibm.com International Business Machines Corporation
 pushkar.umaranikar!intel.com Intel Corporation
 pushkar2017!users.noreply.github.com NotFound
 pushkarj.at.work!gmail.com Independent
-pushkarj.at.work!gmail.com VMware < 2022-10-04
+pushkarj.at.work!gmail.com VMware Inc. < 2022-10-04
 pushkarj.at.work!gmail.com Visa Inc. < 2021-03-05
 pushkarnk!users.noreply.github.com International Business Machines Corporation
 pushm0v.development!gmail.com GOJEK < 2018-09-01
@@ -141544,7 +141544,6 @@ raman.pndy!gmail.com Phillips
 raman.pndy!gmail.com bigbasket < 2018-11-01
 raman.pndy!gmail.com eGovernments < 2017-09-01
 ramana!venus.lekha.org Independent
-ramanarayana_m!infosys.com Infosys Limited
 ramanathana!google.com CNCF < 2020-01-01
 ramanathana!google.com Independent < 2016-06-01
 ramanathana!google.com Signadot
@@ -187609,6 +187608,8 @@ zigmund!users.noreply.github.com Kolesa
 zigo!debian.org GPLHost < 2014-09-01
 zigo!debian.org Mirantis Inc.
 zihantang-rh!users.noreply.github.com Red Hat Inc.
+zihaorao!126.com Alibaba Group
+zihaorao!126.com Independent < 2021-06-03
 zihaoyu!users.noreply.github.com HBO Inc.
 ziheng!users.noreply.github.com International Business Machines Corporation
 zihongz!google.com Google LLC

diff --git a/src/github_users.json b/src/github_users.json