summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorTrey Morris <treyemorris@gmail.com>2011-12-02 17:53:34 -0600
committerTrey Morris <treyemorris@gmail.com>2011-12-05 12:38:23 -0600
commit2e000f35023dfe096e94e95b0673e209d93acef9 (patch)
tree53b76eec1be57ef70bdae6419965ceda329ba896 /.mailmap
parent022295ecc2a936eab98b8a1900690ac0cd87b134 (diff)
downloadnova-2e000f35023dfe096e94e95b0673e209d93acef9.tar.gz
add index to instance_uuid column in instances
Change-Id: I4d5313cfbd97eba7bd755567a0bed9b65adb14dc
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 98a3f31321..26d8882b64 100644
--- a/.mailmap
+++ b/.mailmap
@@ -40,7 +40,7 @@
<nirmal.ranganathan@rackspace.com> <nirmal.ranganathan@rackspace.coom>
<paul@openstack.org> <paul.voccio@rackspace.com>
<paul@openstack.org> <pvoccio@castor.local>
-<rconradharris@gmail.com> <rick.harris@rackspace.com>
+<rconradharris@gmail.com> <rick.harris@rackspace.com>
<rlane@wikimedia.org> <laner@controller>
<sandy.walsh@rackspace.com> <sandy@sandywalsh.com>
<sleepsonthefloor@gmail.com> <root@tonbuntu>
@@ -48,6 +48,7 @@
<throughnothing@gmail.com> <will.wolf@rackspace.com>
<todd@ansolabs.com> <todd@lapex>
<todd@ansolabs.com> <todd@rubidine.com>
+<trey.morris@rackspace.com> <treyemorris@gmail.com>
<tushar.vitthal.patil@gmail.com> <tpatil@vertex.co.in>
<ueno.nachi@lab.ntt.co.jp> <nati.ueno@gmail.com>
<ueno.nachi@lab.ntt.co.jp> <nova@u4>