Post merge updates

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

company_developers2.txt

@@ -5745,6 +5745,7 @@ Cisco:
 	tvaintrob: tvaintrob!users.noreply.github.com, vintrob!cisco.com from 2021-08-13
 	tyandor: tyandor!gmail.com from 2020-02-01 until 2020-07-01
 	tylermzeller: tylermzeller!users.noreply.github.com from 2016-05-01 until 2016-08-01, from 2017-07-01 until 2018-11-01
+	upodroid: cy!borg.dev, mahaali!cisco.com, upodroid!users.noreply.github.com from 2023-06-30
 	userlerueda: userlerueda!users.noreply.github.com
 	utkarsh-pandey-ext: utkarsh-pandey-ext!users.noreply.github.com from 2016-10-01 until 2018-10-01
 	uudiin: tianjia.zhang!linux.alibaba.com
@@ -16295,5 +16296,3 @@ Dotcom River:
 	Marqin: Marqin!users.noreply.github.com until 2017-05-01
 Dotdash:
 	nshankar13: nshankar13!users.noreply.github.com from 2019-06-01 until 2019-08-01
-Dotin:
-	JasmineKh: JasmineKh!users.noreply.github.com from 2020-10-01 until 2021-07-01

company_developers3.txt

@@ -2,6 +2,8 @@
 # If you see an error, please update developers_affiliations.txt and this file will be fixed
 # when regenerated.
 #be:
+Dotin:
+	JasmineKh: JasmineKh!users.noreply.github.com from 2020-10-01 until 2021-07-01
 Dotmatics:
 	MichaelJHaywood: MichaelJHaywood!users.noreply.github.com from 2021-11-01
 	carpnick: carpnick!users.noreply.github.com from 2022-04-01

company_developers8.txt

@@ -4021,7 +4021,7 @@ Rackspace:
 	thequailman: mike.mcrill!rackspace.com, thequailman!users.noreply.github.com
 	thrawn01: thrawn01!gmail.com, thrawn01!users.noreply.github.com until 2017-02-01
 	tonytcampbell: tonytcampbell!users.noreply.github.com until 2017-03-01
-	upodroid: cy!borg.dev, upodroid!users.noreply.github.com
+	upodroid: cy!borg.dev, mahaali!cisco.com, upodroid!users.noreply.github.com until 2023-06-30
 	youg9203: youg9203!users.noreply.github.com from 2020-12-01
 	youtweakit: youtweakit!users.noreply.github.com until 2016-11-01
 	zacharysarah: zach!corleissen.com, zacharysarah!users.noreply.github.com from 2014-05-15 until 2016-03-15

developers_affiliations7.txt

@@ -11036,9 +11036,9 @@ upinetree: upinetree!gmail.com
 	STORES
 upk8s: 545833179!qq.com, hankun01!inspur.com, upk8s!users.noreply.github.com
 	Inspur Group
-upodroid: cy!borg.dev, upodroid!users.noreply.github.com, mahaali!cisco.com
-	Rackspace from 2019-01-07 until 2023-06-30
-	Cisco from 2023-07-01
+upodroid: cy!borg.dev, mahaali!cisco.com, upodroid!users.noreply.github.com
+	Rackspace until 2023-06-30
+	Cisco from 2023-06-30
 uptoknow: haowang!redhat.com, uptoknow!users.noreply.github.com
 	Le TV until 2015-07-01
 	Red Hat Inc. from 2015-07-01

src/cncf-config/email-map

@@ -37292,7 +37292,8 @@ cxucheng!outlook.com Independent < 2021-09-01
 cxucheng!outlook.com Roche < 2017-11-01
 cxucheng!outlook.com Wurl
 cxwshawn!gmail.com New H3C Technologies Co. Ltd
-cy!borg.dev Rackspace
+cy!borg.dev Cisco
+cy!borg.dev Rackspace < 2023-06-30
 cy.l!inwinstack.com InwinSTACK
 cyan.binary!gmail.com Meta Platforms Inc.
 cyan33!users.noreply.github.com Meta Platforms Inc.
@@ -95964,6 +95965,8 @@ mah!lunar.app Independent < 2016-01-01
 mah!lunar.app Lunar A/S
 mah!lunar.app MobilePay < 2020-11-01
 mah!lunar.app eBay < 2015-11-01
+mahaali!cisco.com Cisco
+mahaali!cisco.com Rackspace < 2023-06-30
 mahagon!users.noreply.github.com BMLL Technologies
 mahagon!users.noreply.github.com MPC < 2016-05-01
 mahaisong!hotmail.com 中国
@@ -154725,7 +154728,8 @@ upgundecha!gmail.com Standard Chartered Bank
 upinetree!gmail.com STORES
 upk8s!users.noreply.github.com Inspur Group
 upkar!pm.me Google LLC
-upodroid!users.noreply.github.com Rackspace
+upodroid!users.noreply.github.com Cisco
+upodroid!users.noreply.github.com Rackspace < 2023-06-30
 upxinxin!users.noreply.github.com NotFound
 urakiny!gmail.com Atos < 2018-10-01
 urakiny!gmail.com GNU