diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-02-15 15:01:41 -0500 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-02-15 15:01:41 -0500 |
| commit | 8074ecf9f8e8d4e24909e2255e40da4c5fa9ce9e (patch) | |
| tree | a7f13616e6d7cd393b717e7c59766d43b9a07c8c /Authors | |
| parent | 4a4a3f04b78ba2cbaa0d02ecf0f7cd3cf580901b (diff) | |
| parent | 273e6703a9e4f7e3b7810f204ffb6bb0f86602bd (diff) | |
| download | nova-8074ecf9f8e8d4e24909e2255e40da4c5fa9ce9e.tar.gz nova-8074ecf9f8e8d4e24909e2255e40da4c5fa9ce9e.tar.xz nova-8074ecf9f8e8d4e24909e2255e40da4c5fa9ce9e.zip | |
merging trunk back in; updating Authors conflict
Diffstat (limited to 'Authors')
| -rw-r--r-- | Authors | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -4,6 +4,7 @@ Anthony Young <sleepsonthefloor@gmail.com> Antony Messerli <ant@openstack.org> Armando Migliaccio <Armando.Migliaccio@eu.citrix.com> Brian Waldon <brian.waldon@rackspace.com> +Bilal Akhtar <bilalakhtar@ubuntu.com> Chiradeep Vittal <chiradeep@cloud.com> Chmouel Boudjnah <chmouel@chmouel.com> Chris Behrens <cbehrens@codestud.com> |