summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-09-17 02:57:26 +0000
committerGerrit Code Review <review@openstack.org>2013-09-17 02:57:26 +0000
commitdb6721b5f867c32e5e0b6206d5c3e15f22f6d630 (patch)
tree6da514a815061218afe479d024a7a068f31c81aa /.mailmap
parentd0a7a32a7cf97716e5f8034ad2e82e4a2371b7e5 (diff)
parentbbeb53771264dc95e57f96a6fe2a747d5a550b6c (diff)
downloadnova-db6721b5f867c32e5e0b6206d5c3e15f22f6d630.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 673437d66a..5f177ed053 100644
--- a/.mailmap
+++ b/.mailmap
@@ -106,6 +106,7 @@ Justin Santa Barbara <justin@fathomdb.com> Superstack <superstack@superstack.org
Kei Masumoto <masumotok@nttdata.co.jp> <root@openstack2-api>
Kei Masumoto <masumotok@nttdata.co.jp> Kei masumoto <masumotok@nttdata.co.jp>
Kei Masumoto <masumotok@nttdata.co.jp> masumotok <masumotok@nttdata.co.jp>
+Kun Huang <gareth@unitedstack.com> <academicgareth@gmail.com>
lawrancejing <lawrancejing@gmail.com> <liuqing@windawn.com>
Matt Dietz <matt.dietz@rackspace.com> <matthewdietz@Matthew-Dietzs-MacBook-Pro.local>
Matt Dietz <matt.dietz@rackspace.com> Cerberus <matt.dietz@rackspace.com>