diff options
| author | William Wolf <throughnothing@gmail.com> | 2011-05-11 15:16:37 -0400 |
|---|---|---|
| committer | William Wolf <throughnothing@gmail.com> | 2011-05-11 15:16:37 -0400 |
| commit | 715a2c599d31d712beea11978c28f1b384edc30e (patch) | |
| tree | 9e5a788a0d75dd4d89e855bd75ebe40aa56ce570 /.mailmap | |
| parent | 329a409e865d05d753210b4e31b712fcbd22cd38 (diff) | |
| parent | 5f2bfe56cf12d8f45ae24a5c9dd0c99e6c4d0310 (diff) | |
| download | nova-715a2c599d31d712beea11978c28f1b384edc30e.tar.gz | |
merge from trunk and update .mailmap file
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -29,6 +29,7 @@ <matt.dietz@rackspace.com> <matthewdietz@Matthew-Dietzs-MacBook-Pro.local> <matt.dietz@rackspace.com> <mdietz@openstack> <mordred@inaugust.com> <mordred@hudson> +<naveedm9@gmail.com> <naveed.massjouni@rackspace.com> <nirmal.ranganathan@rackspace.com> <nirmal.ranganathan@rackspace.coom> <paul@openstack.org> <paul.voccio@rackspace.com> <paul@openstack.org> <pvoccio@castor.local> @@ -36,6 +37,7 @@ <rlane@wikimedia.org> <laner@controller> <sleepsonthefloor@gmail.com> <root@tonbuntu> <soren.hansen@rackspace.com> <soren@linux2go.dk> +<throughnothing@gmail.com> <will.wolf@rackspace.com> <todd@ansolabs.com> <todd@lapex> <todd@ansolabs.com> <todd@rubidine.com> <tushar.vitthal.patil@gmail.com> <tpatil@vertex.co.in> @@ -44,5 +46,4 @@ <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> |