summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-08-23 01:29:36 +0000
committerGerrit Code Review <review@openstack.org>2013-08-23 01:29:36 +0000
commitdd55f7e91a68db3f1ba65611be8da02bde25c3fc (patch)
tree5ed89202d272c19e807cab72e5222c5ba19fbe73 /.mailmap
parentde5a24683bf150a0f1e5a5a3cd0eb72de18be1f5 (diff)
parentd0619bc64558e26dae39eb669c4bc0d699d63f8d (diff)
downloadpython-novaclient-dd55f7e91a68db3f1ba65611be8da02bde25c3fc.tar.gz
Merge "Update mailmap"
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 2b533aa8..959e033d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -17,3 +17,4 @@ Nikolay Sokolov <nsokolov@griddynamics.com> Nokolay Sokolov <nsokolov@griddynami
Nikolay Sokolov <nsokolov@griddynamics.com> Nokolay Sokolov <chemikadze@gmail.com>
<jake@ansolabs.com> <admin@jakedahn.com>
<jeblair@hp.com> <james.blair@rackspace.com>
+zhangguoqing <zhangguoqingas@gmail.com> <zhangguoqing@windawn.com>