diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-08-31 17:01:19 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-08-31 17:01:19 -0700 |
| commit | 0f83de82b93d714be6df16b7f151141ab3f4d987 (patch) | |
| tree | a07dc22352352b7599433b8cf46a6d857777ec7e /nova/context.py | |
| parent | bd917feb287a3d0e8f2f9f9c60b716c7f599f4ff (diff) | |
| parent | 3bc7a44dad3233595beb20b63204f16f1cb4376e (diff) | |
| download | nova-0f83de82b93d714be6df16b7f151141ab3f4d987.tar.gz nova-0f83de82b93d714be6df16b7f151141ab3f4d987.tar.xz nova-0f83de82b93d714be6df16b7f151141ab3f4d987.zip | |
merge trunk, fix conflict
Diffstat (limited to 'nova/context.py')
0 files changed, 0 insertions, 0 deletions