summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorJosh Kearney <josh@jk0.org>2011-03-01 10:53:19 -0600
committerJosh Kearney <josh@jk0.org>2011-03-01 10:53:19 -0600
commita95402f5d6c25df83c49d5293917e4c553fd01e7 (patch)
tree3803d1b2a13343acf8a77e1e747c5811c3a50145 /.mailmap
parent97566c04b3a04626f1bc1b66e72c61b4621b6c7d (diff)
parentbb7c1b8c63632c789ed0cd3785a22b7baa90fd83 (diff)
downloadnova-a95402f5d6c25df83c49d5293917e4c553fd01e7.tar.gz
nova-a95402f5d6c25df83c49d5293917e4c553fd01e7.tar.xz
nova-a95402f5d6c25df83c49d5293917e4c553fd01e7.zip
Merged trunk
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index d479bfdf2..df012e066 100644
--- a/.mailmap
+++ b/.mailmap
@@ -41,4 +41,5 @@
<ueno.nachi@lab.ntt.co.jp> <openstack@lab.ntt.co.jp>
<vishvananda@gmail.com> <root@mirror.nasanebula.net>
<vishvananda@gmail.com> <root@ubuntu>
+<naveedm9@gmail.com> <naveed.massjouni@rackspace.com>
<vishvananda@gmail.com> <vishvananda@yahoo.com>