diff options
| author | Brian Lamar <brian.lamar@rackspace.com> | 2011-08-26 14:43:27 -0400 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2011-08-26 14:43:27 -0400 |
| commit | f53a92748320e95a5a2ec60c76bb429f90c3a4f4 (patch) | |
| tree | aef0f3412c199e297238139ae8495e77d3e96f25 /nova/openstack | |
| parent | 63b26178407423524390b2a47425b6953c910e00 (diff) | |
| parent | 9cef60664f0619b608cef182cc65306caf5c348c (diff) | |
Merged trunk and fixed conflicts.
Diffstat (limited to 'nova/openstack')
0 files changed, 0 insertions, 0 deletions