diff options
| author | Tushar Patil <tushar.vitthal.patil@gmail.com> | 2011-03-11 15:15:38 -0800 |
|---|---|---|
| committer | Tushar Patil <tushar.vitthal.patil@gmail.com> | 2011-03-11 15:15:38 -0800 |
| commit | a8fae0e94e0dcadbfc5349813c06466af9c75538 (patch) | |
| tree | 4b35075e5b4f7a5999f7dc265b2dbda00e6a0126 /nova/openstack | |
| parent | e891e48b63065a7218627289a908aece0f6a3730 (diff) | |
| parent | 1112a90cf6d1761ec362d19130f61e518406910f (diff) | |
fixed conflicts after merging with trunk with 787
Diffstat (limited to 'nova/openstack')
0 files changed, 0 insertions, 0 deletions