diff options
| author | Zed Shaw <zedshaw@zedshaw.com> | 2011-07-28 23:20:40 -0700 |
|---|---|---|
| committer | Zed Shaw <zedshaw@zedshaw.com> | 2011-07-28 23:20:40 -0700 |
| commit | 4bae92b7ae8816c0c25c4d2164793d86069793ad (patch) | |
| tree | 6597e66ea15541635fb41546b963c2c53ea44e43 /nova/context.py | |
| parent | eaf8385dfc1bffff3d9a3af39f46deaec7cbb9c3 (diff) | |
| parent | 8c099960a0938f168fe8ca85c63988d697228512 (diff) | |
| download | nova-4bae92b7ae8816c0c25c4d2164793d86069793ad.tar.gz nova-4bae92b7ae8816c0c25c4d2164793d86069793ad.tar.xz nova-4bae92b7ae8816c0c25c4d2164793d86069793ad.zip | |
Merge in from trunk resolving a conflict in test_cloud.py
Diffstat (limited to 'nova/context.py')
0 files changed, 0 insertions, 0 deletions