summaryrefslogtreecommitdiffstats
path: root/Authors
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2010-12-09 10:42:00 -0400
committerSandy Walsh <sandy.walsh@rackspace.com>2010-12-09 10:42:00 -0400
commit94edf2329a1077e76cff32892d37f285ebd26a36 (patch)
treedf2d66c6c03d328069f4a8524dbaa897afd65f81 /Authors
parentcc83aa52086f1472a97914b36f7c4ef7ebb52750 (diff)
parentc5b1fd0424cec19be44751b6f4f2aeec13752733 (diff)
merge with trunk to pull in admin-api branch
Diffstat (limited to 'Authors')
-rw-r--r--Authors2
1 files changed, 2 insertions, 0 deletions
diff --git a/Authors b/Authors
index 62f0c49d5..c9bf3b67c 100644
--- a/Authors
+++ b/Authors
@@ -21,8 +21,10 @@ 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>