diff options
| author | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-09-29 12:27:56 -0400 |
|---|---|---|
| committer | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-09-29 12:27:56 -0400 |
| commit | 8201ef0b16835762fc39956e8b5e4985e94ceb4c (patch) | |
| tree | eaa01250a6736951d0a733ec36fac991fe136153 /nova/context.py | |
| parent | 29eca7e7992fc5c073d70f7c8ca5e5bc03f62af7 (diff) | |
| parent | 1ecff5b5766c8ac0854b80bd819f364b12f3f038 (diff) | |
| download | nova-8201ef0b16835762fc39956e8b5e4985e94ceb4c.tar.gz nova-8201ef0b16835762fc39956e8b5e4985e94ceb4c.tar.xz nova-8201ef0b16835762fc39956e8b5e4985e94ceb4c.zip | |
Update from trunk to handle one-line merge conflict
Diffstat (limited to 'nova/context.py')
0 files changed, 0 insertions, 0 deletions