diff options
| author | matt.dietz@rackspace.com <> | 2011-07-27 11:13:29 -0700 |
|---|---|---|
| committer | matt.dietz@rackspace.com <> | 2011-07-27 11:13:29 -0700 |
| commit | 9590508c6ed33891d4cec47939bbcab1a2260835 (patch) | |
| tree | 49f30ca604c6961eca41e9faea9a881245bf0268 /nova/openstack | |
| parent | 66cf558f1497a1b917fb3db7a61826aefbd6af2e (diff) | |
| parent | 20f0aa25a64bc9f28cc2dceb4bec474fdfa54030 (diff) | |
Merge from trunk and conflict resolution
Diffstat (limited to 'nova/openstack')
0 files changed, 0 insertions, 0 deletions