summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-13 18:11:29 +0000
committerGerrit Code Review <review@openstack.org>2013-06-13 18:11:29 +0000
commit739e6137b8bcd43d991496cc397859b6d02569ac (patch)
treeb7ba9dd56f49d60a6b66536dbf768f4f1199a833 /.mailmap
parent77595f8e08a61507ad5c7c990651fd4f8131c150 (diff)
parent1c0d7aa0c7781a30a65b01bf5b723d2acc370be0 (diff)
downloadnova-739e6137b8bcd43d991496cc397859b6d02569ac.tar.gz
nova-739e6137b8bcd43d991496cc397859b6d02569ac.tar.xz
nova-739e6137b8bcd43d991496cc397859b6d02569ac.zip
Merge "Add yolanda to the mailmap."
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 314596aa1..885f3da58 100644
--- a/.mailmap
+++ b/.mailmap
@@ -88,6 +88,7 @@ Dan Wendlandt <dan@nicira.com> danwent@gmail.com <>
Dan Wendlandt <dan@nicira.com> danwent@gmail.com <dan@nicira.com>
Davanum Srinivas <dims@linux.vnet.ibm.com> Davanum Srinivas <davanum@gmail.com>
Édouard Thuleau <edouard.thuleau@orange.com> Thuleau Édouard <thuleau@gmail.com>
+Ethan Chu <xychu2008@gmail.com> <xchu@redhat.com>
Jake Dahn <jake@ansolabs.com> jakedahn <jake@ansolabs.com>
Jason Koelker <jason@koelker.net> Jason Kölker <jason@koelker.net>
Jay Pipes <jaypipes@gmail.com> jaypipes@gmail.com <>
@@ -123,5 +124,5 @@ Vishvananda Ishaya <vishvananda@gmail.com> <root@mirror.nasanebula.net>
Vishvananda Ishaya <vishvananda@gmail.com> <root@ubuntu>
Vivek YS <vivek.ys@gmail.com> Vivek YS vivek.ys@gmail.com <>
Yaguang Tang <yaguang.tang@canonical.com> <heut2008@gmail.com>
+Yolanda Robla <yolanda.robla@canonical.com> yolanda.robla <yolanda.robla@canonical.com>
Zhongyue Luo <zhongyue.nah@intel.com> <lzyeval@gmail.com>
-Ethan Chu <xychu2008@gmail.com> <xchu@redhat.com>