Merge pull request ceph#16537 from shangzhong/wip-update-organization

mailmap: add affiliation for Zhu Shangzhong Reviewed-By: Abhishek Lekshmanan <[email protected]>
amincheloh · Jul 25, 2017 · 964173c · 964173c
2 parents c8e97f4 + f9e9a5e
commit 964173c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.mailmap b/.mailmap
@@ -500,4 +500,5 @@ Zhiqiang Wang <[email protected]> <[email protected]>
 Zhi Zhang <[email protected]>
 Zhi Zhang <[email protected]> <[email protected]>
 Zhi Zhang <[email protected]> <[email protected]>
+Zhu Shangzhong <[email protected]>
 Zhuang Xiaochun <[email protected]>
diff --git a/.organizationmap b/.organizationmap
@@ -794,6 +794,7 @@ ZTE <[email protected]> Wei Qiaomiao <[email protected]>
 ZTE <[email protected]> Xie Xingguo <[email protected]>
 ZTE <[email protected]> Yan Jun <[email protected]>
 ZTE <[email protected]> Zhang Zezhu <[email protected]>
+ZTE <[email protected]> Zhu Shangzhong <[email protected]>
 #
 # Local Variables:
 # compile-command: "git log --pretty='%aN <%aE>' | \