Post merge updates

lukaszgryglicki · lukaszgryglicki · commit 0f40a1de03ba · 2021-01-14T07:17:08.000Z
Signed-off-by: Łukasz Gryglicki &lt;lukaszgryglicki@o2.pl&gt;
diff --git a/company_developers3.txt b/company_developers3.txt
@@ -12113,6 +12113,8 @@ Liquid Digital Capital Markets:
 	tr8dr: jonathan.shore!gmail.com, tr8dr!users.noreply.github.com from 2018-06-01
 Liquid Healthcare:
 	gileshinchcliff: giles!rebelastronaut.co.uk, gileshinchcliff!users.noreply.github.com from 2014-06-01 until 2015-05-01
+Liquid Reply:
+	mkorbi: 16919345+mkorbi!users.noreply.github.com, m.koerbaecher!reply.de, max!koerbaecher.io, mkorbi!users.noreply.github.com from 2020-09-30
 Liquid Web Hosting Inc.:
 	ctriv: creinhardt!liquidweb.com, ctriv!users.noreply.github.com, github!triv.org
 	shaneutt: shaneutt!linux.com, shaneutt!users.noreply.github.com until 2016-04-01, from 2017-04-01 until 2017-11-01
@@ -13081,5 +13083,3 @@ MSCI:
 MSD:
 	ruzickap: petr.ruzicka!gmail.com, ruzickap!users.noreply.github.com from 2016-02-01 until 2017-09-01
 	zhilingc: zhilingc!users.noreply.github.com until 2014-08-01
-MSE:
-	tompowell-dd: tom.powell!datadoghq.com, tompowell-dd!users.noreply.github.com until 2015-04-01
diff --git a/company_developers4.txt b/company_developers4.txt
@@ -1,6 +1,8 @@
 # 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.
+MSE:
+	tompowell-dd: tom.powell!datadoghq.com, tompowell-dd!users.noreply.github.com until 2015-04-01
 MSIH:
 	barry-schneider: 1751060+barry-schneider!users.noreply.github.com, barry-schneider!users.noreply.github.com, bschneider!msih.com from 2014-04-01
 MSM:
diff --git a/company_developers5.txt b/company_developers5.txt
@@ -5119,7 +5119,7 @@ Storj Labs:
 Storm Reply GmbH:
 	ltagliamonte: ltagliamonte!users.noreply.github.com until 2015-02-01
 	ltagliamonte-dd: ltagliamonte-dd!users.noreply.github.com until 2015-02-01
-	mkorbi: 16919345+mkorbi!users.noreply.github.com, mkorbi!users.noreply.github.com
+	mkorbi: 16919345+mkorbi!users.noreply.github.com, m.koerbaecher!reply.de, max!koerbaecher.io, mkorbi!users.noreply.github.com until 2020-09-30
 	phyrog: phyrog!users.noreply.github.com from 2018-09-01
 StormForger:
 	erdnusskeks: denise!stormforger.com, erdnusskeks!googlemail.com from 2014-11-01
diff --git a/company_developers6.txt b/company_developers6.txt
@@ -1432,14 +1432,14 @@ zwibe:
 	VLZZZ: VLZZZ!users.noreply.github.com until 2017-02-01
 ОАО ТриА:
 	frantony: antonynpavlov!gmail.com
-ООО Зенит торговое оборудывание:
-	Valeryn4: Valeryn4!users.noreply.github.com until 2014-11-01
-ООО Интеллектульная транспортная система:
-	iceone: iceone!users.noreply.github.com from 2014-07-01 until 2016-04-01
 ООО «Центр ИКТ»:
 	vsundupey: vsundupey!users.noreply.github.com until 2016-02-01
 ООО Взор Системс:
 	blockspacer: blockspacer!users.noreply.github.com from 2017-08-01 until 2018-09-01
+ООО Зенит торговое оборудывание:
+	Valeryn4: Valeryn4!users.noreply.github.com until 2014-11-01
+ООО Интеллектульная транспортная система:
+	iceone: iceone!users.noreply.github.com from 2014-07-01 until 2016-04-01
 ООО Компания Тензор:
 	korzhev: korzhev_v!icloud.com from 2015-06-01 until 2017-07-01
 ООО НВП ТЕКО ЛТД:
diff --git a/developers_affiliations3.txt b/developers_affiliations3.txt
@@ -10017,9 +10017,9 @@ mkoderer: marc!koderer.com, mkoderer!users.noreply.github.com
 	SAP from 2015-12-15
 mkogan1: mkogan!redhat.com, mkogan1!users.noreply.github.com
 	Red Hat
-mkorbi: 16919345+mkorbi!users.noreply.github.com, mkorbi!users.noreply.github.com, max@koerbaecher.io, m.koerbaecher@reply.de
-	Storm Reply GmbH from 2018-09-01 until 2020-09-30
-	Liquid Reply from 2020-10-01
+mkorbi: 16919345+mkorbi!users.noreply.github.com, m.koerbaecher!reply.de, max!koerbaecher.io, mkorbi!users.noreply.github.com
+	Storm Reply GmbH until 2020-09-30
+	Liquid Reply from 2020-09-30
 mkorejo: mkorejo!gmail.com, mkorejo!users.noreply.github.com
 	IBM
 mkorolyov: korolyov.maxim!gmail.com, mkorolyov!users.noreply.github.com
diff --git a/src/cncf-config/email-map b/src/cncf-config/email-map
@@ -310,7 +310,8 @@
 1668398275!qq.com Inspur
 1684739+metacpp!users.noreply.github.com Microsoft Corporation
 169064+jingweno!users.noreply.github.com Heroku Inc.
-16919345+mkorbi!users.noreply.github.com Storm Reply GmbH
+16919345+mkorbi!users.noreply.github.com Liquid Reply
+16919345+mkorbi!users.noreply.github.com Storm Reply GmbH < 2020-09-30
 16921579+cristian-radu!users.noreply.github.com NotFound
 1699357+manekinekko!users.noreply.github.com Covéa < 2015-11-01
 1699357+manekinekko!users.noreply.github.com Independent < 2014-11-01
@@ -54296,6 +54297,8 @@ m.judd!queensu.ca Amazon
 m.judd!queensu.ca EverQuote Inc. < 2019-04-01
 m.koderer!telekom.de Deutsche Telekom < 2015-12-15
 m.koderer!telekom.de SAP
+m.koerbaecher!reply.de Liquid Reply
+m.koerbaecher!reply.de Storm Reply GmbH < 2020-09-30
 m.kosieradzki!p2ware.com P2ware
 m.krasilnikov!propellerads.net Propeller Ads
 m.kucia!partner.samsung.com Samsung Electronics Co. Ltd.
@@ -57590,6 +57593,8 @@ max!brnt.mx Orange < 2017-09-01
 max!brnt.mx VMFarms
 max!devopsy.com ThoughtWorks
 max!hinterhof.net NotFound
+max!koerbaecher.io Liquid Reply
+max!koerbaecher.io Storm Reply GmbH < 2020-09-30
 max!kutsevol.com DataRobot
 max!kutsevol.com Lohika Systems Inc. < 2017-05-15
 max!kutsevol.com coolVDS < 2016-02-15
@@ -61069,6 +61074,8 @@ mkobyakov!cyngn.com TUNE
 mkogan!redhat.com Red Hat
 mkolodny!google.com Google
 mkonstan!cisco.com Cisco
+mkorbi!users.noreply.github.com Liquid Reply
+mkorbi!users.noreply.github.com Storm Reply GmbH < 2020-09-30
 mkorejo!gmail.com IBM
 mkoryak!users.noreply.github.com Google
 mkostersitz!users.noreply.github.com Microsoft Corporation
@@ -94091,12 +94098,12 @@ yurishkuro!users.noreply.github.com Uber < 2020-08-24
 yuriw!magna002.ceph.redhat.com Red Hat
 yuriw!redhat.com Red Hat
 yuriy.kolerov!synopsys.com NotFound
-yuriy.pol!gmail.com АПСМАЙЛ LTD < 2014-04-01
 yuriy.pol!gmail.com Ciklum < 2017-05-01
 yuriy.pol!gmail.com Finsight
 yuriy.pol!gmail.com Independent < 2015-09-01
 yuriy.pol!gmail.com LotusFlare < 2016-07-01
 yuriy.pol!gmail.com Prezly < 2018-02-01
+yuriy.pol!gmail.com АПСМАЙЛ LTD < 2014-04-01
 yuriykagan!gmail.com Facebook Inc.
 yurovsky!gmail.com Impinj < 2018-03-01
 yurovsky!gmail.com Oracle
diff --git a/src/github_users.json b/src/github_users.json
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d3f3db6aa7e245b649571f339f8ad44d365f29d70251cd3a8903e63c26b1c07
-size 66439903
+oid sha256:90fa854689b3e16db52cfd7ab2aba1c25f4033c8ad159cd073a44fd3a831159a
+size 66440438
