summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2012-07-05 16:27:12 -0500
committerMonty Taylor <mordred@inaugust.com>2012-07-07 16:32:19 -0500
commiteb2de037a387a2f20f50a81c973a2efd48d73494 (patch)
tree242281c4f99bde07f2a72a9ca3e0997a8fd55d87 /.mailmap
parent642ec634c3beeb69175d0df12bcec8833e7efae5 (diff)
downloadnova-eb2de037a387a2f20f50a81c973a2efd48d73494.tar.gz
Update common setup code to latest.
This gets us up to date with common/setup.py and replaces custom nova autodoc generation with the port of that code found in common. Change-Id: I2a1c5d2c0fdcf40dbea50cc123b537adb068cdc2
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 1 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 5fcd106eda..d372b8cc25 100644
--- a/.mailmap
+++ b/.mailmap
@@ -43,7 +43,7 @@
<justin@fathomdb.com> <justinsb@justinsb-desktop>
<justin@fathomdb.com> <superstack@superstack.org>
<lorin@nimbisservices.com> <lorin@isi.edu>
-<masumotok@nttdata.co.jp> Masumoto<masumotok@nttdata.co.jp>
+<masumotok@nttdata.co.jp> <masumotok@nttdata.co.jp>
<masumotok@nttdata.co.jp> <root@openstack2-api>
<matt.dietz@rackspace.com> <matthewdietz@Matthew-Dietzs-MacBook-Pro.local>
<matt.dietz@rackspace.com> <mdietz@openstack>