diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-05-02 15:23:11 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-05-02 15:23:11 -0400 |
| commit | 89d818c621cf257495ceb07687be04152423086a (patch) | |
| tree | c51959e670e5b31e3e895334b756ea8e1082543c /nova/openstack | |
| parent | 18388b26c0e28df103d07ad0cc28fd9bfaab6416 (diff) | |
| parent | 1a25bb43f68c63844b48b5729d4bcf78cdc94b5c (diff) | |
merging trunk; resolving conflicts
Diffstat (limited to 'nova/openstack')
0 files changed, 0 insertions, 0 deletions