summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorJohannes Erdfelt <johannes.erdfelt@rackspace.com>2011-09-08 13:54:10 +0000
committerJohannes Erdfelt <johannes.erdfelt@rackspace.com>2011-09-08 13:54:10 +0000
commit60a54cfe6111166fe643ccc753f6f9d6265c4fac (patch)
treec999f68764fd3b5f646dba3233a90b75521d5b41 /.mailmap
parent15fe2208e858434c6a6f8ee329055da2ce77b348 (diff)
parentbb3b61b61dc4b45fba4bdab7ead69af239eac40a (diff)
downloadnova-60a54cfe6111166fe643ccc753f6f9d6265c4fac.tar.gz
nova-60a54cfe6111166fe643ccc753f6f9d6265c4fac.tar.xz
nova-60a54cfe6111166fe643ccc753f6f9d6265c4fac.zip
Merge with trunk
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 6b0df4019..b6ae040d6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -15,6 +15,7 @@
<code@term.ie> <termie@preciousroy.local>
<corywright@gmail.com> <cory.wright@rackspace.com>
<dan@nicira.com> <danwent@dan-xs3-cs>
+<dan@nicira.com> danwent@gmail.com
<devin.carlen@gmail.com> <devcamcar@illian.local>
<ewan.mellor@citrix.com> <emellor@silver>
<itoumsn@nttdata.co.jp> <itoumsn@shayol>