summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-08-26 14:32:55 +0000
committerGerrit Code Review <review@openstack.org>2012-08-26 14:32:55 +0000
commit882b31e891c0eaf4cfdac2de7942ecf4d56d1be3 (patch)
treec8a125d777eee757ea418937d733c7db4ac9824c
parent72815cfa963e307df9376ec9eeb296dc45b8acbc (diff)
parentcc616004d1b41667106a77ed7375445fe68a85b2 (diff)
downloadnova-882b31e891c0eaf4cfdac2de7942ecf4d56d1be3.tar.gz
nova-882b31e891c0eaf4cfdac2de7942ecf4d56d1be3.tar.xz
nova-882b31e891c0eaf4cfdac2de7942ecf4d56d1be3.zip
Merge "Update .mailmap"
-rw-r--r--.mailmap2
1 files changed, 1 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index e0a63149d..832af7d8b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -115,5 +115,5 @@ Sateesh Chodapuneedi <sateesh.chodapuneedi@citrix.com> sateesh <sateesh.chodapun
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 <>
-Zhongyue Luo <lzyeval@gmail.com> lzyeval <lzyeval@gmail.com>
+Zhongyue Luo <zhongyue.nah@intel.com> <lzyeval@gmail.com>
Édouard Thuleau <edouard1.thuleau@orange.com> Thuleau Édouard <thuleau@gmail.com>