Post merge updates

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

company_developers4.txt

@@ -5799,6 +5799,7 @@ Independent:
 	jkotalik: jkotalik!users.noreply.github.com until 2015-06-01, from 2015-08-01 until 2016-06-01, from 2016-08-01 until 2017-07-01
 	jkotalik: jkotalik12!gmail.com, jkotalik12!gmail.com, jukotali!microsoft.com, jukotali!microsoft.com until 2016-06-01, from 2016-09-01 until 2017-07-01
 	jleach: jason.leach!fullboar.ca until 2014-10-01
+	jlegoff: jlegoff!users.noreply.github.com, julien.legoff!gmail.com until 2017-09-01
 	jlegrone: git!jacob.work, jlegrone!users.noreply.github.com until 2015-10-01
 	jleni: jleni!users.noreply.github.com, juan.leni!zondax.ch, lenijuan!gmail.com from 2015-08-01 until 2016-05-01, from 2017-05-01 until 2017-11-01
 	jleo32: jleo32!terpmail.umd.edu
@@ -5927,6 +5928,7 @@ Independent:
 	josegob: jose.gob!gmail.com until 2018-03-01
 	josemore: jmore!newrelic.com, josemore!users.noreply.github.com until 2020-07-01
 	josephsawaya: josephsawaya!users.noreply.github.com, josephsawaya938!gmail.com until 2020-05-01, from 2020-09-01 until 2021-05-01
+	josh-ferrell: jferrell!vmware.com, josh-ferrell!users.noreply.github.com until 2021-07-06
 	joshes: j4ah4n!gmail.com, joshes!users.noreply.github.com from 2017-04-01 until 2017-06-01
 	joshimoo: jmoody!sleepycoders.com from 2017-09-01 until 2018-07-01
 	joshix: j!joshix.com, joshix!users.noreply.github.com from 2014-06-01 until 2015-10-01

company_developers6.txt

@@ -1499,6 +1499,7 @@ New Relic Inc.:
 	jessedearing: jesse.dearing!gmail.com, jessedearing!users.noreply.github.com until 2016-05-01
 	jgals: jgalbraith!newrelic.com, jgals!users.noreply.github.com
 	jkwatson: jkwatson!gmail.com, jkwatson!users.noreply.github.com, jwatson!newrelic.com from 2017-03-01 until 2020-09-21
+	jlegoff: jlegoff!users.noreply.github.com, julien.legoff!gmail.com from 2017-09-01
 	jodeev: javarney!gmail.com, jodeev!users.noreply.github.com, jvarney!newrelic.com from 2018-08-01 until 2021-04-01
 	josemore: jmore!newrelic.com, josemore!users.noreply.github.com from 2020-07-01
 	justinfoote: jfoote!newrelic.com, justinandrewfoote!gmail.com, justinfoote!users.noreply.github.com from 2019-03-11

company_developers8.txt

@@ -355,6 +355,7 @@ VMware Inc.:
 	jonathanibers: jonathanibers!users.noreply.github.com from 2017-08-01
 	joonas: joonas!bergi.us, joonas!digitalocean.com, joonas!users.noreply.github.com, joonas.bergius!gmail.com from 2019-07-01
 	jorgemoralespou: jorgemoralespou!users.noreply.github.com from 2019-11-01
+	josh-ferrell: jferrell!vmware.com, josh-ferrell!users.noreply.github.com from 2021-07-06
 	joshrider: 47116457+joshrider!users.noreply.github.com, joshrider!users.noreply.github.com from 2019-12-01 until 2020-05-01
 	joshrosso: joshrosso!gmail.com, rossoj!vmware.com from 2018-11-01
 	joshuagl: jlock!vmware.com, joshuagl!users.noreply.github.com

developers_affiliations3.txt

@@ -18604,8 +18604,9 @@ jlebon: jlebon!redhat.com, jlebon!users.noreply.github.com
 	Red Hat Inc.
 jlefrique: julien.lefrique!gmail.com, lefrique!marvell.com
 	Marvell International Ltd
-jlegoff: julien.legoff!gmail.com, jlegoff!users.noreply.github.com
-        New Relic from 2017-09-01
+jlegoff: jlegoff!users.noreply.github.com, julien.legoff!gmail.com
+	Independent until 2017-09-01
+	New Relic Inc. from 2017-09-01
 jlegrone: git!jacob.work, jlegrone!users.noreply.github.com
 	Independent until 2015-10-01
 	Bernie from 2015-10-01 until 2016-08-01
@@ -20439,6 +20440,7 @@ josguil: josguil!users.noreply.github.com, josra!microsoft.com
 josh: josh!joshpeek.com, seeslau!gmail.com
 	GitHub Inc.
 josh-ferrell: jferrell!vmware.com, josh-ferrell!users.noreply.github.com
+	Independent until 2021-07-06
 	VMware Inc. from 2021-07-06
 josh-tepper: josh-tepper!users.noreply.github.com
 	Google LLC until 2016-04-01
@@ -24072,9 +24074,3 @@ keyonjie: yang.jie!intel.com, yang.jie!linux.intel.com
 	Intel Corporation
 keypusher: keypusher!gmail.com, keypusher!users.noreply.github.com
 	Thumbtack
-keyz: keyz!users.noreply.github.com, kz5!indiana.edu, root!keyanzhang.com
-	AIESEC until 2016-05-01
-	Facebook Inc. from 2016-05-01 until 2016-08-01
-	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

developers_affiliations4.txt

@@ -5,6 +5,12 @@
 # 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.
+keyz: keyz!users.noreply.github.com, kz5!indiana.edu, root!keyanzhang.com
+	AIESEC until 2016-05-01
+	Facebook Inc. from 2016-05-01 until 2016-08-01
+	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
@@ -24079,7 +24085,3 @@ predic8: bayer!predic8.de, predic8!users.noreply.github.com
 preetapan: preetha!hashicorp.com
 	Indeed until 2017-05-01
 	HashiCorp Inc from 2017-05-01
-preichl: preichl!redhat.com
-	Red Hat Inc.
-preillyme: patrick!kismatic.io, preillyme!users.noreply.github.com
-	Kismatic

developers_affiliations5.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.
+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
@@ -24072,6 +24076,3 @@ vistrcm: stas!vitko.me
 	PolySign from 2020-03-01
 visualapps: rakesh.singh!mayadata.io, visualapps!users.noreply.github.com
 	MayaData Inc. (f/k/a CloudByte Inc)
-visualphoenix: raymond.barbiero.dev!gmail.com, visualphoenix!users.noreply.github.com
-	YP until 2017-03-01
-	Stealth Mode Startup Company from 2017-03-01

developers_affiliations6.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.
+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

src/cncf-config/email-map

@@ -57982,6 +57982,8 @@ jfernancordova!gmail.com Independent < 2015-11-01
 jfernancordova!gmail.com Nepuntobiz < 2018-02-01
 jfernancordova!gmail.com PDVSA < 2015-03-01
 jferr!users.noreply.github.com NotFound
+jferrell!vmware.com Independent < 2021-07-06
+jferrell!vmware.com VMware Inc.
 jffernandez!users.noreply.github.com Fenix
 jffernandez!users.noreply.github.com Marketic < 2016-05-01
 jfgauron+github!gmail.com Desjardins Group
@@ -59190,6 +59192,8 @@ jldeen!users.noreply.github.com Microsoft Corporation
 jlebon!redhat.com Red Hat Inc.
 jlebon!users.noreply.github.com Red Hat Inc.
 jlee!thestaticvoid.com Independent
+jlegoff!users.noreply.github.com Independent < 2017-09-01
+jlegoff!users.noreply.github.com New Relic Inc.
 jleloup!users.noreply.github.com Dassault < 2016-07-01
 jleloup!users.noreply.github.com Talend Inc.
 jlengstorf!users.noreply.github.com gatsbyjs
@@ -61690,6 +61694,8 @@ josh!servercobra.com Rackspace
 josh!wealthfront.com Packco Inc.
 josh!webhosting.coop WebHosting
 josh!xr6.me Facebook Inc.
+josh-ferrell!users.noreply.github.com Independent < 2021-07-06
+josh-ferrell!users.noreply.github.com VMware Inc.
 josh-tepper!users.noreply.github.com Clarifai
 josh-tepper!users.noreply.github.com Google LLC < 2016-04-01
 josh.bottum!arrikto.com Arrikto
@@ -63042,6 +63048,8 @@ julien.girardin!scality.com Scality Inc.
 julien.isorce!gmail.com Mesa < 2017-01-01
 julien.isorce!gmail.com Oblong
 julien.landure!gmail.com Zenika
+julien.legoff!gmail.com Independent < 2017-09-01
+julien.legoff!gmail.com New Relic Inc.
 julien.maitrehenry!me.com Crakmedia Inc. < 2015-07-01
 julien.maitrehenry!me.com Ingeno < 2018-09-01
 julien.maitrehenry!me.com Kumojin Solutions inc.

src/input.diff

@@ -1,24 +1,24 @@
-diff --git a/company_developers7.txt b/company_developers7.txt
-index 464bf15b..7505c476 100644
---- a/company_developers7.txt
-+++ b/company_developers7.txt
-@@ -11246,6 +11246,7 @@ Tencent:
- 	attlee-wang: attlee-wang!users.noreply.github.com
- 	aven-ai: aven-ai!users.noreply.github.com
- 	chenhengqi: hengqi.chen!gmail.com from 2015-07-01 until 2016-01-01, from 2016-07-01
- 	hanqiuzh: hanzhang!redhat.com from 2019-07-01 until 2020-01-01, from 2021-03-01
- 	huweihuang: huweihuang!foxmail.com, huweihuang!users.noreply.github.com
- 	hzh0425: hzh0425!users.noreply.github.com
-diff --git a/developers_affiliations1.txt b/developers_affiliations1.txt
-index ba41eab6..19628321 100644
---- a/developers_affiliations1.txt
-+++ b/developers_affiliations1.txt
-@@ -6500,6 +6500,8 @@ GarageDeveloper: GarageDeveloper!users.noreply.github.com, raphael!root-42.com
- 	Root 42
- GarethCOliver: gco!google.com
- 	Google LLC
-+Garrybest: Garrybest!users.noreply.github.com, garryfang!tencent.com, garrybest!foxmail.com
-+    Tencent Holdings Limited
- GarrettGutierrez1: GarrettGutierrez1!users.noreply.github.com
- 	Independent until 2015-02-01
- 	Woodbridge Winery from 2015-02-01 until 2015-08-01
+diff --git a/developers_affiliations3.txt b/developers_affiliations3.txt
+index 47dbe7a1..e76e24ea 100644
+--- a/developers_affiliations3.txt
++++ b/developers_affiliations3.txt
+@@ -18604,6 +18604,8 @@ jlebon: jlebon!redhat.com, jlebon!users.noreply.github.com
+ 	Red Hat Inc.
+ jlefrique: julien.lefrique!gmail.com, lefrique!marvell.com
+ 	Marvell International Ltd
++jlegoff: julien.legoff!gmail.com, jlegoff!users.noreply.github.com
++        Independent until 2017-09-01
++        New Relic from 2017-09-01
+ jlegrone: git!jacob.work, jlegrone!users.noreply.github.com
+ 	Independent until 2015-10-01
+ 	Bernie from 2015-10-01 until 2016-08-01
+@@ -20436,6 +20438,8 @@ josguil: josguil!users.noreply.github.com, josra!microsoft.com
+ 	Microsoft Corporation
+ josh: josh!joshpeek.com, seeslau!gmail.com
+ 	GitHub Inc.
++josh-ferrell: jferrell!vmware.com, josh-ferrell!users.noreply.github.com
++	Independent until 2021-07-06
++	VMware Inc. from 2021-07-06
+ josh-tepper: josh-tepper!users.noreply.github.com
+ 	Google LLC until 2016-04-01
+ 	Clarifai from 2016-04-01