diff options
| author | Thierry Carrez <thierry@openstack.org> | 2011-08-22 09:54:28 +0200 |
|---|---|---|
| committer | Thierry Carrez <thierry@openstack.org> | 2011-08-22 09:54:28 +0200 |
| commit | a7798c2962348ea503e960fb83884972537f6380 (patch) | |
| tree | c68f2287ed7ed24f2dc8e343c32bebe1bb0cd5de /nova/context.py | |
| parent | 0af1508c38bcf027153dd91c0d862307e90a164e (diff) | |
| parent | 6d6ea16b2840d876120f7cad2aa679eee0370cb9 (diff) | |
| download | nova-a7798c2962348ea503e960fb83884972537f6380.tar.gz nova-a7798c2962348ea503e960fb83884972537f6380.tar.xz nova-a7798c2962348ea503e960fb83884972537f6380.zip | |
Fixing merge conflicts
Diffstat (limited to 'nova/context.py')
0 files changed, 0 insertions, 0 deletions