diff options
| author | Todd Willey <todd@ansolabs.com> | 2011-01-27 15:58:22 -0800 |
|---|---|---|
| committer | Todd Willey <todd@ansolabs.com> | 2011-01-27 15:58:22 -0800 |
| commit | f61da82b6dc614867028e39eec71ed98de8bfac7 (patch) | |
| tree | e935ca43b096cd8c79584c49ad32b42d30b0b69a /nova/context.py | |
| parent | 4b4781f5cc015c80c9acb0625aaeac9cde667d4b (diff) | |
| parent | d4f77e1c9eaad19f2a917081737840f9e52dac13 (diff) | |
| download | nova-f61da82b6dc614867028e39eec71ed98de8bfac7.tar.gz nova-f61da82b6dc614867028e39eec71ed98de8bfac7.tar.xz nova-f61da82b6dc614867028e39eec71ed98de8bfac7.zip | |
Merge & fix conflict.
Diffstat (limited to 'nova/context.py')
0 files changed, 0 insertions, 0 deletions