diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-12-16 22:52:08 +0000 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-12-16 22:52:08 +0000 |
| commit | 26ebccc8d92aba23efa1663fe9949c141a4cc671 (patch) | |
| tree | b5c5724d1f806051ffd30b9a8596c52f6a890351 /Authors | |
| parent | dc29400d104d34c6383132a43e018f7724e85ec3 (diff) | |
| parent | cd460a1f661eea7e050891f50a8218fdf24f2c6f (diff) | |
| download | nova-26ebccc8d92aba23efa1663fe9949c141a4cc671.tar.gz nova-26ebccc8d92aba23efa1663fe9949c141a4cc671.tar.xz nova-26ebccc8d92aba23efa1663fe9949c141a4cc671.zip | |
merged trunk, fixed conflicts and tests
Diffstat (limited to 'Authors')
| -rw-r--r-- | Authors | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -3,8 +3,10 @@ Anne Gentle <anne@openstack.org> Anthony Young <sleepsonthefloor@gmail.com> Armando Migliaccio <Armando.Migliaccio@eu.citrix.com> Chris Behrens <cbehrens@codestud.com> +Chmouel Boudjnah <chmouel@chmouel.com> Dean Troyer <dtroyer@gmail.com> Devin Carlen <devin.carlen@gmail.com> +Eldar Nugaev <enugaev@griddynamics.com> Eric Day <eday@oddments.org> Ewan Mellor <ewan.mellor@citrix.com> Hisaki Ohara <hisaki.ohara@intel.com> @@ -20,8 +22,11 @@ Michael Gundlach <michael.gundlach@rackspace.com> Monty Taylor <mordred@inaugust.com> Paul Voccio <paul@openstack.org> Rick Clark <rick@openstack.org> +Ryan Lucio <rlucio@internap.com> +Sandy Walsh <sandy.walsh@rackspace.com> Soren Hansen <soren.hansen@rackspace.com> Todd Willey <todd@ansolabs.com> +Trey Morris <trey.morris@rackspace.com> Vishvananda Ishaya <vishvananda@gmail.com> Youcef Laribi <Youcef.Laribi@eu.citrix.com> Zhixue Wu <Zhixue.Wu@citrix.com> |