diff options
| author | Josh Kearney <josh.kearney@rackspace.com> | 2010-12-23 13:14:56 -0600 |
|---|---|---|
| committer | Josh Kearney <josh.kearney@rackspace.com> | 2010-12-23 13:14:56 -0600 |
| commit | 13e8c8d83b8fc44cff343ea751a98f66857d1865 (patch) | |
| tree | 833ee78ebea8b84a93e84b041e92063e8c9044bf /nova/api | |
| parent | de40fa065b1bc6631e69992e1baeab629b89337d (diff) | |
Resolved merge conflict
Diffstat (limited to 'nova/api')
0 files changed, 0 insertions, 0 deletions