Post merge updates

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

Author: lukaszgryglicki

company_developers3.txt

@@ -4401,6 +4401,7 @@ Independent:
 	mffrench: mathilde.ffrench!echinopsii.net, mffrench!users.noreply.github.com until 2017-03-01
 	mfilocha: mfilocha!users.noreply.github.com
 	mfiumara: mattia.fiumara!bgridsolutions.com until 2015-07-01, from 2015-12-01 until 2016-12-01
+	mflendrich: mflendrich!users.noreply.github.com from 2020-02-01 until 2020-06-01
 	mfmooney: mfm!muteddisk.com
 	mgates: m.gates!, mgates!users.noreply.github.com
 	mgazza: mgazza!users.noreply.github.com until 2015-04-01
@@ -4518,6 +4519,7 @@ Independent:
 	mmcenti: mmcenti!users.noreply.github.com from 2014-07-01 until 2015-05-01, from 2015-08-01 until 2016-02-01
 	mmikowski: mmikowski!users.noreply.github.com, z_mikowski!yahoo.com from 2015-01-01 until 2015-02-01
 	mmingorance-dh: miguel.mingorance!deliveryhero.com, mmingorance-dh!users.noreply.github.com from 2014-10-01 until 2015-06-01, from 2015-10-01 until 2016-03-01
+	mmkkff: mflendrich!users.noreply.github.com, michal!flendrich.pro from 2020-02-01 until 2020-06-01
 	mmorejon: 5578317+mmorejon!users.noreply.github.com, manuel.morejon.85!gmail.com, mmorejon!users.noreply.github.com until 2016-04-01
 	mmrozek: 2864259+mmrozek!users.noreply.github.com, jan.swiecki!gmail.com, michal.mrozek!scalac.io, mmrozek!users.noreply.github.com from 2017-12-01 until 2018-04-01
 	mmstick: mmstick!pm.me, mmstickman!gmail.com until 2018-02-01
@@ -10655,6 +10657,8 @@ Kong Inc.:
 	jakubdyszkiewicz: jakub.dyszkiewicz!gmail.com, jakubdyszkiewicz!users.noreply.github.com from 2019-09-01
 	james-callahan: 35791147+james-callahan!users.noreply.github.com, james!konghq.com, james-callahan!users.noreply.github.com from 2017-12-01 until 2019-09-01
 	kbarnard10: kaitlynbarnard10!gmail.com, kbarnard!linuxfoundation.org, kbarnard10!users.noreply.github.com from 2019-06-01
+	mflendrich: mflendrich!users.noreply.github.com from 2020-06-01
+	mmkkff: mflendrich!users.noreply.github.com, michal!flendrich.pro from 2020-06-01
 	rainest: rainest!users.noreply.github.com, traines!konghq.com from 2018-01-01
 	shashiranjan84: shashi!konghq.com, shashiranjan84!users.noreply.github.com from 2015-01-01
 	subnetmarco: 88.marco!gmail.com, marco!konghq.com, subnetmarco!users.noreply.github.com from 2017-07-01
@@ -13073,9 +13077,3 @@ MRC II Distribution Company L.P.:
 	franziskagoltz: franziska!vdgoltz.eu, franziskagoltz!users.noreply.github.com until 2015-12-01
 MRI Software Investment Management Solutions:
 	kjdelisle: kevin!getstack.ca until 2015-08-01
-MRM//McCann:
-	trevorlinton: trevor.linton!gmail.com, trevor.linton+github!gmail.com until 2015-01-01
-MRV:
-	ednaganon: ednaganon!users.noreply.github.com, ganon.edna!gmail.com until 2017-07-01
-MRV Communications:
-	nyetwurk: nyetwurk!users.noreply.github.com until 2017-09-01

company_developers4.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.
+MRM//McCann:
+	trevorlinton: trevor.linton!gmail.com, trevor.linton+github!gmail.com until 2015-01-01
+MRV:
+	ednaganon: ednaganon!users.noreply.github.com, ganon.edna!gmail.com until 2017-07-01
+MRV Communications:
+	nyetwurk: nyetwurk!users.noreply.github.com until 2017-09-01
 MRobot:
 	maxxlife: maxxlife!users.noreply.github.com, maxxliferobot!gmail.com from 2016-01-01 until 2018-05-01, from 2018-08-01
 MSC Mediterranean Shipping Company:
@@ -16212,9 +16218,3 @@ SEOlytics:
 	galan: galan!users.noreply.github.com until 2015-05-01
 SEQUOIASOFT:
 	cvuillemez: cvuillemez!users.noreply.github.com from 2018-12-01 until 2019-07-01
-SERLI:
-	davidfestal: dfestal!redhat.com until 2017-02-01
-SERPRO:
-	jcmoraisjr: jcmoraisjr!gmail.com, jcmoraisjr!users.noreply.github.com
-	leonardofl: leonardofl87!gmail.com
-	rikatz: ricardo.katz!gmail.com, ricardo.katz!serpro.gov.br, rikatz!users.noreply.github.com

company_developers5.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.
+SERLI:
+	davidfestal: dfestal!redhat.com until 2017-02-01
+SERPRO:
+	jcmoraisjr: jcmoraisjr!gmail.com, jcmoraisjr!users.noreply.github.com
+	leonardofl: leonardofl87!gmail.com
+	rikatz: ricardo.katz!gmail.com, ricardo.katz!serpro.gov.br, rikatz!users.noreply.github.com
 SERVICES EPARGNE ENTREPRISE (S2E):
 	NBardelot: NBardelot!users.noreply.github.com from 2016-10-01 until 2018-02-01
 SESYNC:
@@ -12708,10 +12714,11 @@ Weaveworks:
 	martina-if: martina-if!users.noreply.github.com, martina.iglesiasf!gmail.com from 2018-05-31
 	meccanorak: meccanorak!users.noreply.github.com
 	mewzherder: tamao!weave.works, tamaonakahara!gmail.com
-	mflendrich: mflendrich!users.noreply.github.com
+	mflendrich: mflendrich!users.noreply.github.com until 2020-02-01
 	michaelbeaumont: michaelbeaumont!users.noreply.github.com, michaelbeaumont!weave.works, mjboamail!gmail.com from 2020-05-01
 	mjlodge: git!mathewlodge.com, mjlodge!users.noreply.github.com, ml!lodgephoto.com from 2015-10-01 until 2016-12-01
-	mmkkff: mflendrich!users.noreply.github.com, michal!flendrich.pro, mmkkff!users.noreply.github.com
+	mmkkff: mflendrich!users.noreply.github.com, michal!flendrich.pro until 2020-02-01
+	mmkkff: mmkkff!users.noreply.github.com
 	monadic: alexis.richardson!gmail.com, monadic!users.noreply.github.com
 	palemtnrider: palemtnrider!users.noreply.github.com from 2018-11-05
 	paulbellamy: paul.a.bellamy!gmail.com, paulbellamy!users.noreply.github.com from 2015-05-01 until 2017-05-01
@@ -16659,10 +16666,3 @@ idealista:
 	vicsufer: vicsufer!users.noreply.github.com from 2020-07-01
 idealista.com:
 	dortegau: aleksey.danchin!gmail.com, danielortegaufano!gmail.com, dortegau!users.noreply.github.com
-idealo:
-	manuelkasiske: manuelkasiske!users.noreply.github.com from 2019-10-01
-	steveteuber: steveteuber!users.noreply.github.com
-ideaman's:
-	miyanaga: miyanaga!ideamans.com
-idearium:
-	allanchau: allan.chau!icloud.com, allanchau!users.noreply.github.com from 2016-12-01

company_developers6.txt

@@ -1,6 +1,13 @@
 # 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.
+idealo:
+	manuelkasiske: manuelkasiske!users.noreply.github.com from 2019-10-01
+	steveteuber: steveteuber!users.noreply.github.com
+ideaman's:
+	miyanaga: miyanaga!ideamans.com
+idearium:
+	allanchau: allan.chau!icloud.com, allanchau!users.noreply.github.com from 2016-12-01
 ideeli:
 	jwolski2: jeff!wercker.com, jwolski2!users.noreply.github.com from 2012-01-15 until 2013-05-01
 idwall:

developers_affiliations3.txt

@@ -8590,8 +8590,9 @@ mfiumara: mattia.fiumara!bgridsolutions.com
 mfleming: matt!codeblueprint.co.uk, matt!console-pimps.org, matt.fleming!intel.com
 	Intel until 2015-10-01
 	SUSE LLC from 2015-10-01
-mflendrich: michal!flendrich.pro mflendrich!users.noreply.github.com
+mflendrich: mflendrich!users.noreply.github.com
 	Weaveworks until 2020-02-01
+	Independent from 2020-02-01 until 2020-06-01
 	Kong Inc. from 2020-06-01
 mfmooney: mfm!muteddisk.com
 	Independent
@@ -10295,7 +10296,11 @@ mmithun: mmithun!juniper.net
 	Juniper Networks
 mmkayPL: mateusz.kozlowski!intel.com
 	Intel
-mmkkff: mflendrich!users.noreply.github.com, michal!flendrich.pro, mmkkff!users.noreply.github.com
+mmkkff: mflendrich!users.noreply.github.com, michal!flendrich.pro
+	Weaveworks until 2020-02-01
+	Independent from 2020-02-01 until 2020-06-01
+	Kong Inc. from 2020-06-01
+mmkkff: mmkkff!users.noreply.github.com
 	Weaveworks
 mml: mml!google.com, mml!users.noreply.github.com
 	Google
@@ -24727,7 +24732,3 @@ sergiohinojosa: sergiohinojosa!users.noreply.github.com
 	Dynatrace LLC from 2015-09-01
 sergiomcalzada: sergio.m.calzada!gmail.com, sergio.moreno.calzada!everis.com, sergiomcalzada!users.noreply.github.com
 	everis
-sergioprado: sergio.prado!e-labworks.com
-	Embedded Labworks
-sergmelikyan: serg.melikyan!gmail.com, sergmelikyan!users.noreply.github.com, smelikyan!mirantis.com
-	Mirantis Inc.

developers_affiliations4.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.
+sergioprado: sergio.prado!e-labworks.com
+	Embedded Labworks
+sergmelikyan: serg.melikyan!gmail.com, sergmelikyan!users.noreply.github.com, smelikyan!mirantis.com
+	Mirantis Inc.
 serhatcetinkaya: serhatcetinkaya!pm.me
 	Independent until 2016-05-01
 	TUBITAK UEKAE from 2016-05-01 until 2016-08-01

src/cncf-config/email-map

@@ -59190,7 +59190,9 @@ mfisher!deis.com Deis < 2017-05-01
 mfisher!deis.com Microsoft Corporation
 mfisher!engineyard.com Microsoft Corporation
 mfiuczyn!akamai.com Akamai Technologies Inc.
-mflendrich!users.noreply.github.com Weaveworks
+mflendrich!users.noreply.github.com Independent < 2020-06-01
+mflendrich!users.noreply.github.com Kong Inc.
+mflendrich!users.noreply.github.com Weaveworks < 2020-02-01
 mflo999!gmail.com Apprenda Inc.
 mfloryan!users.noreply.github.com Spotify Sweden AB
 mflpopescu!users.noreply.github.com NotFound
@@ -59798,7 +59800,9 @@ michal!cichra.cz Red Hat
 michal!clumio.com Cloudera Inc. < 2018-11-01
 michal!clumio.com Clumio
 michal!clumio.com Nutanix Inc. < 2015-10-01
-michal!flendrich.pro Weaveworks
+michal!flendrich.pro Independent < 2020-06-01
+michal!flendrich.pro Kong Inc.
+michal!flendrich.pro Weaveworks < 2020-02-01
 michal!improbable.io Google < 2014-12-01
 michal!improbable.io Improbable
 michal!kinvolk.io Allegro < 2015-08-01

src/github_users.json

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ff16b39407b35d58639508c026be757d818dd8d8b66346874e4197a9d00510d4
-size 66453703
+oid sha256:312156f8c4620a20d006fd53b1dd409507bdaa6ca9e5c775189b05426f333ac8
+size 66453847