Post merge updates

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

company_developers1.txt

@@ -12423,7 +12423,6 @@ Aviatrix:
 	nmittler: nathanmittler!google.com, nmittler!gmail.com, nmittler!users.noreply.github.com from 2022-09-12
 	ostromart: mostrowski!google.com, ostromart!gmail.com, ostromart!users.noreply.github.com from 2023-11-01
 	rlenglet: rlenglet!google.com, rlenglet!users.noreply.github.com, romain.lenglet!berabera.info from 2020-07-01 until 2022-01-01
-	stevenctl:  from 2023-02-05
 	stevenctl: landow!google.com, slandow!aviatrix.com, stevenctl!users.noreply.github.com from 2023-02-05 until 2023-04-07
 	stewartbutler: sbutler!aviatrix.com, stewartbutler!google.com, stewartbutler!users.noreply.github.com from 2023-03-01
 	therealmitchconnors: mitchconnors!gmail.com, therealmitchconnors!users.noreply.github.com from 2022-11-03

company_developers3.txt

@@ -6918,6 +6918,7 @@ Elasticsearch Inc.:
 	LikeTheSalad: 56847527+LikeTheSalad!users.noreply.github.com, LikeTheSalad!users.noreply.github.com
 	Mpdreamz: Mpdreamz!users.noreply.github.com, ml!elastic.co, mpdreamz!gmail.com
 	SeanHeelan: SeanHeelan!users.noreply.github.com, sean!heelan.io, sean.heelan!elastic.co until 2023-12-11
+	SergeyKleyman: sergey.kleyman!elastic.co, sergeykleyman!users.noreply.github.com
 	SylvainJuge: SylvainJuge!users.noreply.github.com, sylvain.juge!elastic.co
 	abeyad: abeyad!users.noreply.github.com from 2015-12-01 until 2017-07-01
 	adriansr: adriansr!users.noreply.github.com from 2017-10-01 until 2022-08-01

company_developers4.txt

@@ -3333,7 +3333,6 @@ Google LLC:
 	stevemao: steve.mao!healthinteract.com.au from 2021-03-01
 	stevemcghee: smcghee!google.com until 2017-07-01, from 2019-03-01
 	stevenbrix: stevenbrix!users.noreply.github.com from 2021-03-01
-	stevenctl:  until 2023-02-05
 	stevenctl: landow!google.com, slandow!aviatrix.com, stevenctl!users.noreply.github.com until 2023-02-05
 	stevenicholls-google: stevenicholls!google.com
 	stevenjack: stevenjack!users.noreply.github.com from 2021-03-01

company_developers9.txt

@@ -15758,6 +15758,7 @@ Tetrate.io:
 	eitansuez: eitansuez!users.noreply.github.com from 2021-12-01
 	gonzaloserrano: gonzaloserrano!users.noreply.github.com from 2021-06-01
 	gusreiber: gusreiber!users.noreply.github.com, pasthelod!gmail.com from 2018-10-01 until 2019-07-01
+	incfly: hujianfei258!gmail.com, incfly!users.noreply.github.com, jianfeih!google.com from 2021-08-01 until 2022-10-01
 	liamawhite: liam!tetrate.io, liamawhite!gmail.com, liamawhite!users.noreply.github.com, liamwhite!uk.ibm.com
 	lizan: lizan!tetrate.io, lizan!users.noreply.github.com, lizan.j!gmail.com, lzhou!aviatrix.com, zlizan!google.com from 2018-09-01 until 2023-03-01
 	morepork: morepork!users.noreply.github.com from 2021-03-01
@@ -15780,8 +15781,6 @@ Tetrate.io:
 	zhaohuabing: huabing!tetrate.io, huabingzhao!tencent.com, zhao.huabing!zte.com.cn, zhaohuabing!gmail.com, zhaohuabing!users.noreply.github.com from 2023-05-04
 	zinuga: varun.talwar!gmail.com, zafar.k87!gmail.com, zinuga!users.noreply.github.com from 2018-03-01
 	zirain: hejianpeng2!huawei.com, zirain!tetrate.io, zirain!users.noreply.github.com, zirain2009!gmail.com, zirain2009!hotmail.com from 2023-07-13
-Tetrate.is:
-	incfly: hujianfei258!gmail.com, incfly!users.noreply.github.com, jianfeih!google.com from 2021-08-01 until 2022-10-01
 Tetrio:
 	noe-charmet: noe-charmet!users.noreply.github.com from 2018-03-01 until 2019-11-01
 Teuto.net Netzdienste GmbH:

developers_affiliations2.txt

@@ -637,6 +637,8 @@ SergeyKanzhelev: SergeyKanzhelev!users.noreply.github.com, s.kanzhelev!live.com,
 SergeyKaydalov: SergeyKaydalov!users.noreply.github.com, kayserg!gmail.com
 	Infopulse until 2016-05-01
 	Independent from 2016-05-01
+SergeyKleyman: sergey.kleyman!elastic.co, sergeykleyman!users.noreply.github.com
+	Elasticsearch Inc.
 SergeyLavr: SergeyLavr!users.noreply.github.com, selavrin!microsoft.com
 	Microsoft Corporation until 2021-06-01
 	Meta Platforms Inc. from 2021-06-01 until 2023-04-01

developers_affiliations4.txt

@@ -18970,7 +18970,7 @@ incfly: hujianfei258!gmail.com, incfly!users.noreply.github.com, jianfeih!google
 	UC Irvine until 2014-08-01
 	Independent from 2014-08-01 until 2015-04-01
 	Google LLC from 2015-04-01 until 2021-08-01
-	Tetrate.is from 2021-08-01 until 2022-10-01
+	Tetrate.io from 2021-08-01 until 2022-10-01
 	Clickhouse from 2022-10-01
 incu6us: vyacheslavpryimak!gmail.com
 	International Business Machines Corporation until 2017-04-01

developers_affiliations7.txt

@@ -10138,8 +10138,6 @@ sergeyfd: sergeyfd!gmail.com, sergeyfd!users.noreply.github.com
 sergeykad: sergey.kadaner!checkmarx.com, sergeykad!users.noreply.github.com
 	Amdocs Limited until 2015-02-01
 	Checkmarx from 2015-02-01
-sergeykleyman: sergey.kleyman!elastic.co, sergeykleyman!users.noreply.github.com
-	Elasticsearch Inc.
 sergeykonkin: sergeykonkin!users.noreply.github.com
 	Independent until 2015-10-01
 	CNET from 2015-10-01 until 2019-10-01
@@ -17731,9 +17729,6 @@ stevenceuppens: steven.ceuppens!icloud.com
 	HP Inc. from 2019-01-01
 stevencohn: stevencohn!users.noreply.github.com
 	Waters Corporation
-stevenctl: 
-	Google LLC until 2023-02-05
-	Aviatrix from 2023-02-05
 stevenctl: landow!google.com, slandow!aviatrix.com, stevenctl!users.noreply.github.com
 	Google LLC until 2023-02-05
 	Aviatrix from 2023-02-05 until 2023-04-07
@@ -23848,3 +23843,7 @@ 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

developers_affiliations8.txt

@@ -5,10 +5,6 @@
 # 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

src/cncf-config/email-map

@@ -49943,7 +49943,7 @@ dio!tetrate.io Tetrate.io
 dio!users.noreply.github.com HOOQ < 2018-02-01
 dio!users.noreply.github.com Independent < 2016-02-01
 dio!users.noreply.github.com Independent < 2018-08-01
-dio!users.noreply.github.com Tertate.io
+dio!users.noreply.github.com Tetrate.io
 diodesign!users.noreply.github.com Situation Publishing
 diogo!docker.com Airtable < 2018-11-01
 diogo!docker.com Anchor Labs Inc
@@ -154273,6 +154273,7 @@ sergey.glibey!gmail.com Amazon
 sergey.gnuskov!flant.com FLANT EUROPE OÜ
 sergey.kadaner!checkmarx.com Amdocs Limited < 2015-02-01
 sergey.kadaner!checkmarx.com Checkmarx
+sergey.kleyman!elastic.co Elasticsearch Inc.
 sergey.lapin!cogentembedded.com NotFound
 sergey.maslyakov!viavisolutions.com Viavi Solutions Inc.
 sergey.mudrik!gmail.com BrightLocal
@@ -154294,6 +154295,7 @@ sergeygo!mellanox.com Mellanox
 sergeygoder!gmail.com Deem < 2014-05-01
 sergeygoder!gmail.com Meta Platforms Inc.
 sergeyhydra!users.noreply.github.com Independent
+sergeykleyman!users.noreply.github.com Elasticsearch Inc.
 sergeykonkin!users.noreply.github.com Bank < 2022-06-01
 sergeykonkin!users.noreply.github.com CNET < 2019-10-01
 sergeykonkin!users.noreply.github.com Independent < 2015-10-01
@@ -188437,5 +188439,3 @@ zzzzx10!users.noreply.github.com NotFound
 zzzzz.co.kr!gmail.com Independent
 ~!eligrey.com OFTN < 2019-06-01
 ~!eligrey.com Transcend
-sergey.kleyman!elastic.co Elasticsearch Inc.
-sergeykleyman!users.noreply.github.com Elasticsearch Inc.

src/mapping.json

@@ -3389,6 +3389,7 @@
   "TeraMach": "TeraMach Technologies Inc.",
   "Teralytics": "Teralytics AG",
   "TerraPower": "TerraPower LLC.",
+  "Tertate.io": "Tetrate.io",
   "Tesla": "Tesla Inc.",
   "Tesla Inc": "Tesla Inc.",
   "Tesla Inc .": "Tesla Inc.",
@@ -3398,7 +3399,6 @@
   "Testim": "Testim Inc",
   "Tetrate": "Tetrate.io",
   "Tetrate.is": "Tetrate.io",
-  "Tertate.io": "Tetrate.io",
   "Texas Instruments": "Texas Instruments Incorporated",
   "Thalmic": "North Inc.",
   "The Aerospace Corporation": "Aerospace Corporation",
@@ -4243,4 +4243,4 @@
   "뱅크샐러드(레이니스트)": "Banksalad Co. Ltd.",
   "스마일게이트": "Smilegate Holdings Inc",
   "패스트캠퍼스": "Fast campus"
-}
+}