Merge pull request ceph#16067 from YangFanlinux/affi

.mailmap, .organizationmap: Update Fan Yang information and affiliation Reviewed By: Jos Collin <[email protected]>
senax · Jul 3, 2017 · 32297cc · 32297cc
2 parents fe2f113 + fecd7dc
commit 32297cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.mailmap b/.mailmap
@@ -96,6 +96,7 @@ Eric Lee <[email protected]>
 Eric Mourgaya <[email protected]> <[email protected]>
 Erwin, Brock A <[email protected]> <[email protected]>
 Esteban Molina-Estolano <[email protected]> <eestolan@29311d96-e01e-0410-9327-a35deaab8ce9>
+Fan Yang <[email protected]> <[email protected]>
 Fangchen Sun <[email protected]>
 Fang Yuxiang <[email protected]>
 Fang Yuxiang <[email protected]> <[email protected]>

diff --git a/.organizationmap b/.organizationmap
@@ -331,6 +331,7 @@ MSys Technologies <[email protected]> Rajesh Nambiar <rajesh.n@msyste
 Nebula <[email protected]> Anton Aksola <[email protected]>
 Nebula <[email protected]> Chris Holcombe <[email protected]>
 Netease <[email protected]> Dong Wu <[email protected]>
+Neunn <[email protected]> Fan Yang <[email protected]>
 Ocado <[email protected]> Luis Periquito <[email protected]>
 Odiso <[email protected]> Alexandre Derumier <[email protected]>
 Opower <[email protected]> Derrick Schneider <[email protected]>