diff options
| author | Tushar Patil <tushar.vitthal.patil@gmail.com> | 2011-09-01 14:29:43 -0700 |
|---|---|---|
| committer | Tushar Patil <tushar.vitthal.patil@gmail.com> | 2011-09-01 14:29:43 -0700 |
| commit | d55dedbcceeab883c22eda19879221edb7a9d7e0 (patch) | |
| tree | da76c80ac7704b108ee4f30141ff193aa24a9fd5 /nova/context.py | |
| parent | 43a392814150e49769e935f4972c9901612570af (diff) | |
| parent | ce6f55b4bd889d9e873598bb23ed37327d75252e (diff) | |
| download | nova-d55dedbcceeab883c22eda19879221edb7a9d7e0.tar.gz nova-d55dedbcceeab883c22eda19879221edb7a9d7e0.tar.xz nova-d55dedbcceeab883c22eda19879221edb7a9d7e0.zip | |
Resolved conflicts and fixed pep8 errors
Diffstat (limited to 'nova/context.py')
0 files changed, 0 insertions, 0 deletions