diff options
| author | Brian Lamar <brian.lamar@rackspace.com> | 2011-05-31 16:30:09 -0400 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2011-05-31 16:30:09 -0400 |
| commit | b8bcc715fccbd1e3ae82f508e7d4334414818d35 (patch) | |
| tree | b710c89e67b4c4b7be11005538c0d30a9bcea060 /nova/openstack | |
| parent | f668339effa089360c1989082c83afc35489f71e (diff) | |
| parent | 0b7104a8c6b2b2e3fed4a09b239439964aeb2774 (diff) | |
Merged trunk and fixed conflicts.
Diffstat (limited to 'nova/openstack')
0 files changed, 0 insertions, 0 deletions