merge from trunk and update .mailmap file

openstack/nova

Code Issues Proposed changes

This commit is contained in:

William Wolf

2011年05月11日 15:16:37 -04:00

parent 329a409e86 5f2bfe56cf

commit 715a2c599d

27 changed files with 867 additions and 73 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>