diff options
| author | Brian Lamar <brian.lamar@rackspace.com> | 2011-08-24 18:25:21 -0400 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2011-08-24 18:25:21 -0400 |
| commit | 6c4329f846685ee54c5265e5cc56e58e6fbd55e9 (patch) | |
| tree | 12ad918100278ae16dd4d01c93b91abf46322868 /nova/api | |
| parent | 5f1380bfc69913f6aeb2a64e3501f77973493bc3 (diff) | |
stub_instance fix from merge conflict
Diffstat (limited to 'nova/api')
0 files changed, 0 insertions, 0 deletions