diff options
| author | Brian Lamar <brian.lamar@rackspace.com> | 2011-02-17 10:35:28 -0500 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2011-02-17 10:35:28 -0500 |
| commit | 220e8cb73a480ef1fb1342df2ae459e8f142f161 (patch) | |
| tree | 8d132180eb0eea8927c1ec226f36f150dfd73ac4 /Authors | |
| parent | 6b5823f0aa75707fad6ca38dde490a47b740c3da (diff) | |
| parent | 7798a551e39cf39a26e966f7ef7ecea52b3f77c3 (diff) | |
| download | nova-220e8cb73a480ef1fb1342df2ae459e8f142f161.tar.gz | |
Merged trunk and fixed conflict with other Brian in Authors
Diffstat (limited to 'Authors')
| -rw-r--r-- | Authors | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -5,6 +5,7 @@ Antony Messerli <ant@openstack.org> Armando Migliaccio <Armando.Migliaccio@eu.citrix.com> Bilal Akhtar <bilalakhtar@ubuntu.com> Brian Lamar <brian.lamar@rackspace.com> +Brian Schott <bschott@isi.edu> <bfschott@gmail.com> Chiradeep Vittal <chiradeep@cloud.com> Chmouel Boudjnah <chmouel@chmouel.com> Chris Behrens <cbehrens@codestud.com> |