summaryrefslogtreecommitdiffstats
path: root/Authors
diff options
context:
space:
mode:
authorSalvatore Orlando <salvatore.orlando@eu.citrix.com>2011-03-07 17:03:27 +0000
committerSalvatore Orlando <salvatore.orlando@eu.citrix.com>2011-03-07 17:03:27 +0000
commitdaaa68415a33c975e3e136f9a02af6f9bf2c3fdb (patch)
tree8a629f2c7403e4b9a743927ac846b2ab5cb76683 /Authors
parent97563d650a08e7f2d1aa1f08237219291d821e39 (diff)
parent9610c61055ab84038becf4af0b63bab9071a900a (diff)
downloadnova-daaa68415a33c975e3e136f9a02af6f9bf2c3fdb.tar.gz
nova-daaa68415a33c975e3e136f9a02af6f9bf2c3fdb.tar.xz
nova-daaa68415a33c975e3e136f9a02af6f9bf2c3fdb.zip
Merged with current trunk
Updated _get_vm_opaqueref: OpaqueRef inspection not performed anymore No test-specific code path No weird lists for known vm references merged stubout_db_network_api with stubout_db_instance_api Unit tests passed pep8 errors fixed
Diffstat (limited to 'Authors')
-rw-r--r--Authors6
1 files changed, 4 insertions, 2 deletions
diff --git a/Authors b/Authors
index 34d852631..d3765d897 100644
--- a/Authors
+++ b/Authors
@@ -32,7 +32,7 @@ John Dewey <john@dewey.ws>
Jonathan Bryce <jbryce@jbryce.com>
Jordan Rinke <jordan@openstack.org>
Josh Durgin <joshd@hq.newdream.net>
-Josh Kearney <josh.kearney@rackspace.com>
+Josh Kearney <josh@jk0.org>
Joshua McKenty <jmckenty@gmail.com>
Justin Santa Barbara <justin@fathomdb.com>
Kei Masumoto <masumotok@nttdata.co.jp>
@@ -40,6 +40,7 @@ Ken Pepple <ken.pepple@gmail.com>
Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Koji Iida <iida.koji@lab.ntt.co.jp>
Lorin Hochstein <lorin@isi.edu>
+Masanori Itoh <itoumsn@nttdata.co.jp>
Matt Dietz <matt.dietz@rackspace.com>
Michael Gundlach <michael.gundlach@rackspace.com>
Monsyne Dragon <mdragon@rackspace.com>
@@ -47,7 +48,8 @@ Monty Taylor <mordred@inaugust.com>
MORITA Kazutaka <morita.kazutaka@gmail.com>
Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
-Naveed Massjouni <naveed.massjouni@rackspace.com>
+Naveed Massjouni <naveedm9@gmail.com>
+Nirmal Ranganathan <nirmal.ranganathan@rackspace.com>
Paul Voccio <paul@openstack.org>
Ricardo Carrillo Cruz <emaildericky@gmail.com>
Rick Clark <rick@openstack.org>