Post merge updates

Signed-off-by: Łukasz Gryglicki <[email protected]>
RyanZhaoXB · Mar 22, 2022 · f527b7f · f527b7f
1 parent 34a58d2
commit f527b7f
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 33 deletions.
diff --git a/company_developers1.txt b/company_developers1.txt
@@ -4548,6 +4548,7 @@ Amadeus:
 	ahurtaud: ahurtaud!users.noreply.github.com, alban.hurtaud!amadeus.com
 	ainouche: ainouche!gmail.com from 2016-11-01
 	alexanderConstantinescu: aconstan!redhat.com, alexanderConstantinescu!users.noreply.github.com until 2019-07-01
+	andreadecorte: adecorte!gmail.com, andreadecorte!users.noreply.github.com, klenje!users.noreply.github.com from 2016-01-04
 	anthonyroux: anthony.roux!amadeus.com, rcuni8!gmail.com
 	apelisse: apelisse!gmail.com, apelisse!google.com, apelisse!users.noreply.github.com until 2014-08-01
 	ateleshev: ateleshev!users.noreply.github.com until 2016-12-01

diff --git a/company_developers4.txt b/company_developers4.txt
@@ -2527,6 +2527,7 @@ Independent:
 	andizzle: andizzle!users.noreply.github.com, andizzle.zhang!gmail.com until 2017-05-01, from 2017-08-01 until 2018-01-01, from 2018-05-01 until 2019-05-01, from 2019-12-01 until 2020-09-01
 	andor44: andor44!gmail.com, andor44!users.noreply.github.com from 2017-01-01 until 2017-03-01
 	andras-gerendas: andras-gerendas!users.noreply.github.com until 2016-10-01
+	andreadecorte: adecorte!gmail.com, andreadecorte!users.noreply.github.com, klenje!users.noreply.github.com until 2016-01-04
 	andreamelloncelli: andrea.melloncelli!gmail.com, andreamelloncelli!users.noreply.github.com
 	andreamerello: andrea.merello!gmail.com, yujinqiuustb!gmail.com
 	andreas131989: andreas131989!users.noreply.github.com from 2014-11-01 until 2017-11-01

diff --git a/developers_affiliations1.txt b/developers_affiliations1.txt
@@ -1565,9 +1565,6 @@ 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

diff --git a/developers_affiliations2.txt b/developers_affiliations2.txt
@@ -1315,6 +1315,9 @@ andrea-adami: andrea.adami!gmail.com
 	FULCRO SRLU
 andreabolognani: abologna!redhat.com, andreabolognani!users.noreply.github.com
 	Red Hat Inc.
+andreadecorte: adecorte!gmail.com, andreadecorte!users.noreply.github.com, klenje!users.noreply.github.com
+	Independent until 2016-01-04
+	Amadeus from 2016-01-04
 andreafagan: andreafagan!users.noreply.github.com, andreafagan28!gmail.com
 	Arvato
 andreafalzetti: andreafalzetti!users.noreply.github.com
@@ -23894,7 +23897,3 @@ 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
-	Apple Inc.
diff --git a/developers_affiliations3.txt b/developers_affiliations3.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.
+dzafman: dzafman!redhat.com, dzafman!users.noreply.github.com
+	Red Hat Inc.
+dzannotti: d.zannotti!me.com
+	Apple Inc.
 dzapata: dzapata!netflix.com, dzapata!users.noreply.github.com
 	OFICIOSVARIOS
 dzavalkinolx: dmytro.zavalkin!olx.com, dzavalkinolx!users.noreply.github.com
@@ -24070,8 +24074,3 @@ kfdm: kfdm!users.noreply.github.com, kungfudiscomonkey!gmail.com, paul.traylor!l
 	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
-	Webaholics from 2017-03-01 until 2018-02-01
-	Akirix LLC from 2018-02-01
diff --git a/developers_affiliations4.txt b/developers_affiliations4.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.
+kferrone: kferrone!users.noreply.github.com
+	Tree-LineBuilders Inc. until 2015-11-01
+	Independent from 2015-11-01 until 2017-03-01
+	Webaholics from 2017-03-01 until 2018-02-01
+	Akirix LLC from 2018-02-01
 kfirfer: kfirfer!gmail.com, kfirfer!users.noreply.github.com
 	Independent until 2015-08-01
 	Idomoo from 2015-08-01 until 2017-03-01
@@ -24078,6 +24083,3 @@ 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
diff --git a/developers_affiliations5.txt b/developers_affiliations5.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.
+premkumar-gg: premkumar-gg!users.noreply.github.com
+	fosh.io until 2016-05-01
+	giffgaff from 2016-05-01
 presidentbeef: justin!presidentbeef.com, presidentbeef!users.noreply.github.com
 	Twitter Inc. until 2015-05-01
 	SurveyMonkey from 2015-05-01 until 2018-06-01
@@ -24074,5 +24077,3 @@ 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
diff --git a/developers_affiliations6.txt b/developers_affiliations6.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.
+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
 	DIGITEUM
 vitaliytv: vitaliytv!nitra.ua, vitaliytv!nitralabs.com, vitaliytv!users.noreply.github.com

diff --git a/src/cncf-config/email-map b/src/cncf-config/email-map
@@ -5932,6 +5932,8 @@ addyjeridiq!gmail.com Script Foundation
 addyosmani!gmail.com Google LLC
 addyosmani!users.noreply.github.com Google LLC
 adecarolis!users.noreply.github.com Independent
+adecorte!gmail.com Amadeus
+adecorte!gmail.com Independent < 2016-01-04
 aded!users.noreply.github.com Independent < 2017-11-01
 aded!users.noreply.github.com Taocomp
 adeeb!adeebahmed.com Target
@@ -11352,6 +11354,8 @@ andreabogazzi79!gmail.com FORM3
 andreabogazzi79!gmail.com JUST EAT < 2019-02-01
 andreabogazzi79!gmail.com JustGiving < 2017-03-01
 andreacalia!users.noreply.github.com CERN
+andreadecorte!users.noreply.github.com Amadeus
+andreadecorte!users.noreply.github.com Independent < 2016-01-04
 andreaf!hpe.com HP Inc. < 2016-11-11
 andreaf!hpe.com International Business Machines Corporation
 andreafagan28!gmail.com Arvato
@@ -66662,6 +66666,8 @@ klem.dev!gmail.com Orah < 2017-12-01
 klement.dominik86!gmail.com Red Hat Inc.
 klempner!google.com Google LLC
 klempner!imsanet.org Google LLC
+klenje!users.noreply.github.com Amadeus
+klenje!users.noreply.github.com Independent < 2016-01-04
 klesarev!users.noreply.github.com Independent
 kleung!google.com Google LLC
 kliberti!bu.edu Red Hat Inc.

diff --git a/src/github_users.json b/src/github_users.json
diff --git a/src/input.diff b/src/input.diff
@@ -1,14 +1,14 @@
-diff --git a/developers_affiliations3.txt b/developers_affiliations3.txt
-index 2ec111b0..002ebea8 100644
---- a/developers_affiliations3.txt
-+++ b/developers_affiliations3.txt
-@@ -19532,6 +19532,8 @@ josegonzalez: email!josediazgonzalez.com, josegonzalez!users.noreply.github.com,
- 	SeatGeek
- joselamego: jose.a.lamego!intel.com, joselamego!users.noreply.github.com
- 	Intel Corporation
-+josemore: jmore!newrelic.com, josemore!users.noreply.github.com
-+	Independent until 2020-07-01
-+	New Relic from 2020-07-01
- josepalafox: jose.palafox!intel.com, josepalafox!users.noreply.github.com, martin.david.siagian!gmail.com
- 	Intel Corporation
- joseph-lanoux: joseph-lanoux!users.noreply.github.com, joseph.lanoux!hpe.com
+diff --git a/developers_affiliations1.txt b/developers_affiliations1.txt
+index 1d53f65d..b751272e 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