diff options
| author | Ryan Lane <laner@controller> | 2010-12-22 23:47:31 +0000 |
|---|---|---|
| committer | Ryan Lane <laner@controller> | 2010-12-22 23:47:31 +0000 |
| commit | 5012ccb22724c2f7fb0fcdcb7b146d5d5e61337d (patch) | |
| tree | 3d44d084647c86c41cc189d3a8bf8bcdedba3ef7 /Authors | |
| parent | e893be0a8d32cf1eb2c91187b81a6febf90e5b7c (diff) | |
| parent | 3f37287c1adfe35756c58938ea8d826181bad2e2 (diff) | |
Merge from trunk, and resolve conflict with nova/auth/ldapdriver.py
Diffstat (limited to 'Authors')
| -rw-r--r-- | Authors | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -3,8 +3,11 @@ 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> +Ed Leafe <ed@leafe.com> +Eldar Nugaev <enugaev@griddynamics.com> Eric Day <eday@oddments.org> Ewan Mellor <ewan.mellor@citrix.com> Hisaki Ohara <hisaki.ohara@intel.com> @@ -12,6 +15,7 @@ Jay Pipes <jaypipes@gmail.com> Jesse Andrews <anotherjesse@gmail.com> Joe Heck <heckj@mac.com> Joel Moore <joelbm24@gmail.com> +Jonathan Bryce <jbryce@jbryce.com> Josh Kearney <josh.kearney@rackspace.com> Joshua McKenty <jmckenty@gmail.com> Justin Santa Barbara <justin@fathomdb.com> @@ -21,8 +25,11 @@ 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> +Thierry Carrez <thierry@openstack.org> 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> |