post merge updates

Signed-off-by: Łukasz Gryglicki <lukaszgryglicki@o2.pl>
tiagolobocastro · Apr 23, 2020 · 83058b2 · 83058b2
1 parent 692aba6
commit 83058b2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 23 deletions.
diff --git a/src/cncf-config/email-map b/src/cncf-config/email-map
@@ -462,6 +462,7 @@
 30418983+mdharamadas1!users.noreply.github.com VMware
 30441101+sethp-nr!users.noreply.github.com NotFound
 30510064+bryangunn!users.noreply.github.com NotFound
+30538043+jonathan-teh!users.noreply.github.com MayaData
 30545166+gkarthiks!users.noreply.github.com Black Rock
 30545166+gkarthiks!users.noreply.github.com Independent < 2016-09-01
 30620077+chhetripradeep!users.noreply.github.com StashAway
@@ -33341,6 +33342,7 @@ jonathan.sokolowski!gmail.com Commonwealth Bank
 jonathan.sokolowski!gmail.com Expert360 < 2016-01-01
 jonathan.sokolowski!gmail.com Independent < 2015-01-01
 jonathan.tarith!gmail.com Independent
+jonathan.teh!mayadata.io MayaData
 jonathan.tsai!quantatw.com Zenefits
 jonathan.tsai!quantatw.com ZippyApp < 2018-02-01
 jonathan.ziller!gmail.com Credit Suisse < 2015-03-01

diff --git a/src/input.diff b/src/input.diff
@@ -1,26 +1,13 @@
-diff --git a/developers_affiliations1.txt b/developers_affiliations1.txt
-index 7b84b030..4070f5ca 100644
---- a/developers_affiliations1.txt
-+++ b/developers_affiliations1.txt
-@@ -3917,6 +3917,8 @@ KumarAmitMehta: gmate.amit!gmail.com
- 	Marvell Semiconductor from 2017-12-01
- Kumba42: kumba!gentoo.org
- 	Gentoo
-+Kundan2707: Kundan2707!users.noreply.github.com
-+	NEC
- Kunde21: Kunde21!users.noreply.github.com, kunde21!gmail.com
- 	Independent
- Kuqd: Kuqd!users.noreply.github.com, cyril.tovena!gmail.com, cyril.tovena!ubisoft.com
 diff --git a/developers_affiliations2.txt b/developers_affiliations2.txt
-index 41a7186f..eda735de 100644
+index fb1697c9..0a02c295 100644
 --- a/developers_affiliations2.txt
 +++ b/developers_affiliations2.txt
-@@ -21779,6 +21779,8 @@ pyk: bayualdiyansyah!gmail.com, pyk!users.noreply.github.com
- 	salestock
- pyle: adam!pyle.dev, admpyle!gmail.com, pyle!users.noreply.github.com
- 	Google
-+pyohannes: johannes!johannes.tax, jtax!newrelic.com
-+	New Relic
- pyr: pyr!spootnik.org
- 	Exoscale
- pyther: gyurgyikms!ornl.gov
+@@ -6705,6 +6705,8 @@ jonatasbaldin: dave.lawler!outlook.com, jonatas.baldin!gmail.com, jonatasbaldin!
+ 	Nomanini from 2019-04-01
+ jonathan-kosgei: jonathan!saharacluster.com, jonathan-kosgei!users.noreply.github.com
+ 	Sahara Cluster
++jonathan-teh: 30538043+jonathan-teh!users.noreply.github.com, jonathan.teh!mayadata.io
++	MayaData from 2020-02-01
+ jonathanbeber: jonathanbeber!gmail.com, jonathanbeber!users.noreply.github.com, xiayiqian!sjtu.edu.cn
+ 	Zalando
+ jonathanibers: jonathanibers!users.noreply.github.com