diff options
| author | Rick Harris <rick.harris@rackspace.com> | 2010-12-30 11:26:21 -0600 |
|---|---|---|
| committer | Rick Harris <rick.harris@rackspace.com> | 2010-12-30 11:26:21 -0600 |
| commit | 2a08bed775aef2574d362cee6b7883469bbd2e09 (patch) | |
| tree | 89d43a89758150efccca52900d0829dc48653a55 /.mailmap | |
| parent | cc906e48c13012da552cc346146d9586afc6092e (diff) | |
| parent | 0880026253d0de67afd7c80415b332f72764457d (diff) | |
| download | nova-2a08bed775aef2574d362cee6b7883469bbd2e09.tar.gz | |
Merging trunk
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -27,4 +27,6 @@ <vishvananda@gmail.com> <root@ubuntu> <sleepsonthefloor@gmail.com> <root@tonbuntu> <rlane@wikimedia.org> <laner@controller> -<rick.harris@rackspace.com> <rconradharris@gmail.com> +<rconradharris@gmail.com> <rick.harris@rackspace.com> +<corywright@gmail.com> <cory.wright@rackspace.com> +<ant@openstack.org> <amesserl@rackspace.com> |