diff --git a/company_developers1.txt b/company_developers1.txt index 0a7bddd73..2cf20757c 100644 --- a/company_developers1.txt +++ b/company_developers1.txt @@ -8645,6 +8645,7 @@ Docker: JimGalasyn: JimGalasyn!users.noreply.github.com Joffrey F: f.joffrey!gmail.com, joffrey!docker.com Johannes 'fish' Ziemke: fish!freigeist.org, github!freigeist.org until 2015-07-01 + John Harris: joharris!vmware.com, john!johnharris.io, johnharris85!users.noreply.github.com until 2019-01-11 John Mulhausen: johndylan!johndylan-macpro.roam.corp.google.com from 2016-08-01 until 2018-02-01 Josh Chorlton: josh.chorlton!docker.com Josh Hawn: josh.hawn!docker.com @@ -8710,7 +8711,6 @@ Docker: houbena: houbena!users.noreply.github.com icecrime: icecrime!users.noreply.github.com jeffqwb2017: jeff.qi!docker.com, jeffqwb2017!users.noreply.github.com - johnharris85: johnharris85!users.noreply.github.com mgoelzer: mgoelzer!users.noreply.github.com michaKFromParis: michaKFromParis!users.noreply.github.com pchico83: pchico83!users.noreply.github.com @@ -20475,5 +20475,3 @@ Infinite: vinoth.kondiyaan: vinoth.kondiyaan!infinite.com Infinity Works: Edward Marshall: ruckafella!gmail.com -Infinity Works Consulting for Udisclosed Public Body: - Steven Iveson: sjiveson!users.noreply.github.com diff --git a/company_developers2.txt b/company_developers2.txt index 2f2530f52..b61696190 100644 --- a/company_developers2.txt +++ b/company_developers2.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. +Infinity Works Consulting for Udisclosed Public Body: + Steven Iveson: sjiveson!users.noreply.github.com Inflection: Kaitlyn Barnard: kaitlynbarnard10!gmail.com, kbarnard!linuxfoundation.org until 2015-09-01 Influitive: diff --git a/company_developers3.txt b/company_developers3.txt index c3c0d5051..656d5e45d 100644 --- a/company_developers3.txt +++ b/company_developers3.txt @@ -456,6 +456,7 @@ VMware: Jin Heo: heoj!vmware.com Joe Beda: jbeda!vmware.com, joe!bedafamily.com, joe!heptio.com, joe.github!bedafamily.com from 2018-12-11 Joe Stringer: joe!ovn.org, joe!wand.net.nz, joestringer!nicira.com, joestringer!users.noreply.github.com + John Harris: joharris!vmware.com, john!johnharris.io, johnharris85!users.noreply.github.com from 2019-01-11 Jonas Rosland: jrosland!vmware.com Jorge O. Castro: jorge!heptio.com, jorge!ubuntu.com, jorge.castro!gmail.com, jorgec!vmware.com from 2018-12-11 Jorgen Hansen: jhansen!vmware.com diff --git a/developers_affiliations1.txt b/developers_affiliations1.txt index d0cf8ea9c..60913a013 100644 --- a/developers_affiliations1.txt +++ b/developers_affiliations1.txt @@ -23236,6 +23236,9 @@ John Hanks: johnhank!amazon.com Amazon John Harrigan: jharriga!redhat.com Red Hat +John Harris: joharris!vmware.com, john!johnharris.io, johnharris85!users.noreply.github.com + VMware + Docker until 2019-01-11 John Harrison: john.c.harrison!intel.com Intel John Hawkes: hawkes!jackhammer.engr.sgi.com, hawkes!sgi.com @@ -35813,9 +35816,3 @@ Ozben Evren: ozevren!users.noreply.github.com Google P J P: ppandit!redhat.com, prasad!redhat.com Red Hat -P L Sai Krishna: lakshmi.sai.krishna.potthuri!xilinx.com, lakshmis!xilinx.com - Xilinx -P Raviraj Sitaram: raviraj.p.sitaram!intel.com - Intel -PCzhangPC: pengcheng.zhang!easystack.cn - EasyStack diff --git a/developers_affiliations2.txt b/developers_affiliations2.txt index 349784fce..ab7746d91 100644 --- a/developers_affiliations2.txt +++ b/developers_affiliations2.txt @@ -2,6 +2,12 @@ # If you see your name with asterisk '*' sign - it means that # multiple affiliations were found for you with different email addresses. # Please merge all of them into one then. +P L Sai Krishna: lakshmi.sai.krishna.potthuri!xilinx.com, lakshmis!xilinx.com + Xilinx +P Raviraj Sitaram: raviraj.p.sitaram!intel.com + Intel +PCzhangPC: pengcheng.zhang!easystack.cn + EasyStack PFHJYG0: jon.goering!compuware.com NotFound PI-Victor: ipalade!redhat.com @@ -25154,8 +25160,6 @@ johndmulhausen: johndylan!google.com, johndylan!johndylan-macbookpro2.roam.corp. Google johngossman: johngossman!users.noreply.github.com Microsoft -johnharris85: johnharris85!users.noreply.github.com - Docker johnjbarton: johnjbarton!johnjbarton.com Google johnrdavidge: johnrdavidge!gmail.com diff --git a/src/all_affs.csv b/src/all_affs.csv index 82b6e1aea..9ce622343 100644 --- a/src/all_affs.csv +++ b/src/all_affs.csv @@ -35857,6 +35857,8 @@ "johanru!axis.com","Johan Rudholm","Axis Communications","","domain" "johanssn!de.ibm.com","Michael Johanssen","IBM","","domain" "johansson.k.patrik!gmail.com","Patrik Johansson","(Unknown)","","config" +"joharris@vmware.com","John Harris","Docker","2019-01-11","config" +"joharris@vmware.com","John Harris","VMware","","config" "johfel!gmx.de","Johann Felix Soden","(Unknown)","","config" "johfel!users.sourceforge.net","Johann Felix Soden","NotFound","","config" "johfjeld!cisco.com","Johan Fjeldtvedt","Cisco","","domain" @@ -36045,6 +36047,8 @@ "john.zheng!hp.com","john","HP","","config" "john3909!gmail.com","John Syne","(Unknown)","","config" "john453!faraday-tech.com","Feng-Hsin Chiang","(Unknown)","","config" +"john@johnharris.io","John Harris","Docker","2019-01-11","config" +"john@johnharris.io","John Harris","VMware","","config" "johnSchnake!users.noreply.github.com","John Schnake","Apcera","","config" "john_gong!usish.com","John Gong","(Unknown)","","config" "john_mazzie!dell.com","John Mazzie","Dell","","domain" @@ -36080,6 +36084,8 @@ "johngmyers!users.noreply.github.com","John Gardiner Myers","Proofpoint","","config" "johnhamelink!users.noreply.github.com","John Hamelink","Independent","","config" "johnhank!amazon.com","John Hanks","Amazon","","config" +"johnharris85!users.noreply.github.com","John Harris","Docker","2019-01-11","config" +"johnharris85!users.noreply.github.com","John Harris","VMware","","config" "johnhbrock!gmail.com","John Brock","(Unknown)","","config" "johnholiver!gmail.com","JohnHoliver","(Unknown)","","config" "johnjbarton!johnjbarton.com","johnjbarton","Google","","config" diff --git a/src/cncf-config/email-map b/src/cncf-config/email-map index bc401215a..b33479c19 100644 --- a/src/cncf-config/email-map +++ b/src/cncf-config/email-map @@ -15197,6 +15197,8 @@ johannes.erdfelt!rackspace.com Rackspace johannes.scheuermann!inovex.de Inovex johannes.wuerbach!googlemail.com Contentful johanni.thunstrom!workday.com Workday +joharris@vmware.com Docker < 2019-01-11 +joharris@vmware.com VMware johfel!users.sourceforge.net NotFound johluo!microsoft.com Microsoft john!apcera.com Apcera @@ -15264,6 +15266,8 @@ john.wilkins!inktank.com Red Hat john.williams!petalogix.com NotFound john.zeringue!twosigma.com Two Sigma john.zheng!hp.com HP +john@johnharris.io Docker < 2019-01-11 +john@johnharris.io VMware johnbcoughlin!gmail.com NotFound johnbyrneio!users.noreply.github.com Heptio johncarlhofman!gmail.com Eneco Energy @@ -15279,7 +15283,8 @@ johnfwhitmore!gmail.com ElectronicSoup < 2018-11-01 johnfwhitmore!gmail.com FDS johngossman!users.noreply.github.com Microsoft johnhank!amazon.com Amazon -johnharris85!users.noreply.github.com Docker +johnharris85!users.noreply.github.com Docker < 2019-01-11 +johnharris85!users.noreply.github.com VMware johnjbarton!johnjbarton.com Google johnkenneth.moore!gmail.com AMEX < 2017-06-01 johnkenneth.moore!gmail.com Myndshft