From c69d7dd15715a7dcc27bfea070c341768094e7d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Gryglicki?= Date: Thu, 24 Mar 2022 10:13:54 +0000 Subject: [PATCH] Post merge updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Łukasz Gryglicki --- company_developers7.txt | 2 +- developers_affiliations1.txt | 4 ++-- src/cncf-config/email-map | 3 +++ src/github_users.json | 4 ++-- src/input.diff | 31 +++++++++++++++++++++---------- 5 files changed, 29 insertions(+), 15 deletions(-) diff --git a/company_developers7.txt b/company_developers7.txt index 7505c4760..c71afdb98 100644 --- a/company_developers7.txt +++ b/company_developers7.txt @@ -11246,7 +11246,6 @@ Tencent: attlee-wang: attlee-wang!users.noreply.github.com aven-ai: aven-ai!users.noreply.github.com chenhengqi: hengqi.chen!gmail.com from 2015-07-01 until 2016-01-01, from 2016-07-01 - Garrybest: Garrybest!users.noreply.github.com, garryfang!tencent.com, garrybest!foxmail.com hanqiuzh: hanzhang!redhat.com from 2019-07-01 until 2020-01-01, from 2021-03-01 huweihuang: huweihuang!foxmail.com, huweihuang!users.noreply.github.com hzh0425: hzh0425!users.noreply.github.com @@ -11275,6 +11274,7 @@ Tencent Holdings Limited: AngryHacker: AngryHacker!users.noreply.github.com ChenLingPeng: ChenLingPeng!users.noreply.github.com, forrestchen!tencent.com Frefreak: frefreak.zxy!gmail.com + Garrybest: Garrybest!users.noreply.github.com, garrybest!foxmail.com, garryfang!tencent.com GraysonWu: GraysonWu!users.noreply.github.com, wgrayson!vmware.com from 2018-07-01 until 2018-12-01 JaySon-Huang: JaySon-Huang!users.noreply.github.com, jayson.hjs!gmail.com Jeegn-Chen: jeegnchen!gmail.com from 2016-12-01 diff --git a/developers_affiliations1.txt b/developers_affiliations1.txt index 196283214..d9563650d 100644 --- a/developers_affiliations1.txt +++ b/developers_affiliations1.txt @@ -6500,8 +6500,6 @@ GarageDeveloper: GarageDeveloper!users.noreply.github.com, raphael!root-42.com Root 42 GarethCOliver: gco!google.com Google LLC -Garrybest: Garrybest!users.noreply.github.com, garryfang!tencent.com, garrybest!foxmail.com - Tencent Holdings Limited GarrettGutierrez1: GarrettGutierrez1!users.noreply.github.com Independent until 2015-02-01 Woodbridge Winery from 2015-02-01 until 2015-08-01 @@ -6512,6 +6510,8 @@ GarrickHe: 32883830+garrickhe!users.noreply.github.com, garrick_he!dell.com Cisco until 2017-02-01 Cortex from 2017-02-01 until 2017-10-01 dell from 2017-10-01 +Garrybest: Garrybest!users.noreply.github.com, garrybest!foxmail.com, garryfang!tencent.com + Tencent Holdings Limited Garu94: Garu94!users.noreply.github.com Independent until 2018-04-01 Lavoratore autonomo from 2018-04-01 until 2018-07-01 diff --git a/src/cncf-config/email-map b/src/cncf-config/email-map index 75de1aabd..8cebf646e 100644 --- a/src/cncf-config/email-map +++ b/src/cncf-config/email-map @@ -2768,6 +2768,7 @@ Galen-Yip!users.noreply.github.com Tencent Holdings Limited GaneshSPatil!users.noreply.github.com ThoughtWorks Inc GaoRong!users.noreply.github.com NetEase Inc Garciat!users.noreply.github.com Uber +Garrybest!users.noreply.github.com Tencent Holdings Limited GauntletWizard!users.noreply.github.com lifeonairteam Gcaufy!users.noreply.github.com Tencent Holdings Limited GeetikaBatra!users.noreply.github.com Red Hat Inc. < 2021-08-04 @@ -43506,6 +43507,8 @@ garridomota!gmail.com UnderwriteMe garron!users.noreply.github.com EnergySavvy < 2019-02-01 garron!users.noreply.github.com Google LLC garron!users.noreply.github.com Independent < 2019-07-01 +garrybest!foxmail.com Tencent Holdings Limited +garryfang!tencent.com Tencent Holdings Limited gartdan!users.noreply.github.com Microsoft Corporation garth!garthk.com Amplified.ai garth!garthk.com Anditi < 2019-03-01 diff --git a/src/github_users.json b/src/github_users.json index 18aec1fd5..ed89eb40a 100644 --- a/src/github_users.json +++ b/src/github_users.json @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc66b87a73a62dbb891683e1eca909cb2f98ca4f26619201bdcc35f6e59867bd -size 74573632 +oid sha256:da90b8dc1c7ffd93e1ceade09ed9c23ab34b12688fce88079bfefb55eebbdc8d +size 74573918 diff --git a/src/input.diff b/src/input.diff index 13728f242..cec98adfc 100644 --- a/src/input.diff +++ b/src/input.diff @@ -1,13 +1,24 @@ +diff --git a/company_developers7.txt b/company_developers7.txt +index 464bf15b..7505c476 100644 +--- a/company_developers7.txt ++++ b/company_developers7.txt +@@ -11246,6 +11246,7 @@ Tencent: + attlee-wang: attlee-wang!users.noreply.github.com + aven-ai: aven-ai!users.noreply.github.com + chenhengqi: hengqi.chen!gmail.com from 2015-07-01 until 2016-01-01, from 2016-07-01 + hanqiuzh: hanzhang!redhat.com from 2019-07-01 until 2020-01-01, from 2021-03-01 + huweihuang: huweihuang!foxmail.com, huweihuang!users.noreply.github.com + hzh0425: hzh0425!users.noreply.github.com diff --git a/developers_affiliations1.txt b/developers_affiliations1.txt -index 1d53f65d..72dedccc 100644 +index ba41eab6..19628321 100644 --- a/developers_affiliations1.txt +++ b/developers_affiliations1.txt -@@ -14771,6 +14771,8 @@ RyanW8: RyanW8!users.noreply.github.com - Node4 from 2017-11-01 until 2020-01-01 - Telent from 2020-01-01 until 2020-03-01 - Nutmeg from 2020-03-01 -+RyanZhaoXB: zhaor_thu!163.com, RyanZhaoXB!users.noreply.github.com -+ Huawei Technologies Co. Ltd - RyanZim: opensrc!ryanzim.com, ryanzim!users.noreply.github.com - Independent - Ryceancurry: justinpopo6!gmail.com +@@ -6500,6 +6500,8 @@ GarageDeveloper: GarageDeveloper!users.noreply.github.com, raphael!root-42.com + Root 42 + GarethCOliver: gco!google.com + Google LLC ++Garrybest: Garrybest!users.noreply.github.com, garryfang!tencent.com, garrybest!foxmail.com ++ Tencent Holdings Limited + GarrettGutierrez1: GarrettGutierrez1!users.noreply.github.com + Independent until 2015-02-01 + Woodbridge Winery from 2015-02-01 until 2015-08-01