diff options
| author | Kevin L. Mitchell <kevin.mitchell@rackspace.com> | 2011-07-29 18:59:33 +0000 |
|---|---|---|
| committer | Kevin L. Mitchell <kevin.mitchell@rackspace.com> | 2011-07-29 18:59:33 +0000 |
| commit | 62c7ca622a42aaed9a4f23e8fc2167655b2ff58f (patch) | |
| tree | 5d62b83e53098339f20f003ee99d8c0760aed7ce /nova/image | |
| parent | c0355038b462cfd75b423a535601c4463c68f80f (diff) | |
| parent | ab0c38efa5440347c3c75171e703e010023affe2 (diff) | |
pull-up from trunk; fix problem obscuring context module with context param; fix conflicts and no-longer-skipped tests
Diffstat (limited to 'nova/image')
0 files changed, 0 insertions, 0 deletions