diff options
| author | Jason Cannavale <jason.cannavale@rackspace.com> | 2011-05-31 11:43:38 -0500 |
|---|---|---|
| committer | Jason Cannavale <jason.cannavale@rackspace.com> | 2011-05-31 11:43:38 -0500 |
| commit | e16ac0dbe6d1ca73ef6bb8f906c2dfdf2269ab6d (patch) | |
| tree | dcebc68b5b18b25e6a58d2d2f2808b52ab47b81c | |
| parent | 51247c01f8ec3b89657c130935d039ae9fa776b0 (diff) | |
| download | nova-e16ac0dbe6d1ca73ef6bb8f906c2dfdf2269ab6d.tar.gz nova-e16ac0dbe6d1ca73ef6bb8f906c2dfdf2269ab6d.tar.xz nova-e16ac0dbe6d1ca73ef6bb8f906c2dfdf2269ab6d.zip | |
Cleaned up text conflict.
| -rw-r--r-- | Authors | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1,4 +1,5 @@ Alex Meade <alex.meade@rackspace.com> +Andrey Brindeyev <abrindeyev@griddynamics.com> Andy Smith <code@term.ie> Andy Southgate <andy.southgate@citrix.com> Anne Gentle <anne@openstack.org> @@ -16,6 +17,7 @@ Christian Berendt <berendt@b1-systems.de> Chuck Short <zulcss@ubuntu.com> Cory Wright <corywright@gmail.com> Dan Prince <dan.prince@rackspace.com> +Dave Walker <DaveWalker@ubuntu.com> David Pravec <David.Pravec@danix.org> Dean Troyer <dtroyer@gmail.com> Devin Carlen <devin.carlen@gmail.com> @@ -28,6 +30,7 @@ Gabe Westmaas <gabe.westmaas@rackspace.com> Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp> Hisaki Ohara <hisaki.ohara@intel.com> Ilya Alekseyev <ialekseev@griddynamics.com> +Isaku Yamahata <yamahata@valinux.co.jp> Jason Cannavale <jason.cannavale@rackspace.com> Jason Koelker <jason@koelker.net> Jay Pipes <jaypipes@gmail.com> @@ -65,6 +68,7 @@ Nachi Ueno <ueno.nachi@lab.ntt.co.jp> Naveed Massjouni <naveedm9@gmail.com> Nirmal Ranganathan <nirmal.ranganathan@rackspace.com> Paul Voccio <paul@openstack.org> +Renuka Apte <renuka.apte@citrix.com> Ricardo Carrillo Cruz <emaildericky@gmail.com> Rick Clark <rick@openstack.org> Rick Harris <rconradharris@gmail.com> @@ -81,6 +85,7 @@ Trey Morris <trey.morris@rackspace.com> Tushar Patil <tushar.vitthal.patil@gmail.com> Vasiliy Shlykov <vash@vasiliyshlykov.org> Vishvananda Ishaya <vishvananda@gmail.com> +Vivek Y S <vivek.ys@gmail.com> William Wolf <throughnothing@gmail.com> Yoshiaki Tamura <yoshi@midokura.jp> Youcef Laribi <Youcef.Laribi@eu.citrix.com> |