diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-03-24 18:47:36 -0400 |
|---|---|---|
| committer | Dan Prince <dan.prince@rackspace.com> | 2011-03-24 18:47:36 -0400 |
| commit | 064954a297a5f7c199d3949d6951f6b414b4504a (patch) | |
| tree | 20a7c8e5b9313bd7dc57767a0a221f7b50fa31b9 /nova/openstack | |
| parent | f51e2f3091f19823a5ad5ec7039cc1d18ce041e6 (diff) | |
| parent | 4e179b4fa9ab35dc50486e7f42e1dc6d06b74c81 (diff) | |
Merge w/ trunk resolving conflicts.
Diffstat (limited to 'nova/openstack')
0 files changed, 0 insertions, 0 deletions