diff options
| author | Brian Lamar <brian.lamar@rackspace.com> | 2011-03-25 11:10:54 -0400 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2011-03-25 11:10:54 -0400 |
| commit | da5076d9d865232f0f607d036f0ec7e838238771 (patch) | |
| tree | a5b796789e5118dd4a8abae9fe4d54fd2aeba973 /nova/openstack | |
| parent | 3d06c636537374557ee6ff77b7c0bc7718eafcdb (diff) | |
| parent | e26e360106c2aeb468be90de609caaf03e1dab43 (diff) | |
Merged trunk and fixed broken/conflicted tests.
Diffstat (limited to 'nova/openstack')
0 files changed, 0 insertions, 0 deletions