diff options
| author | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-03-09 16:51:05 -0500 |
|---|---|---|
| committer | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-03-09 16:51:05 -0500 |
| commit | 355870e732f11ee21642a9ce0568fa30ef7b16bb (patch) | |
| tree | 29b283bd6bcb33ab960afcf85f817b70e8112ab8 /nova/utils.py | |
| parent | 95d25ba3f4cd3345355922018295f3789d5ddb7c (diff) | |
| parent | f93e424c0c722f5607086349787a95517f31d79b (diff) | |
| download | nova-355870e732f11ee21642a9ce0568fa30ef7b16bb.tar.gz nova-355870e732f11ee21642a9ce0568fa30ef7b16bb.tar.xz nova-355870e732f11ee21642a9ce0568fa30ef7b16bb.zip | |
merge lp:nova, fix conflicts, fix tests
Diffstat (limited to 'nova/utils.py')
0 files changed, 0 insertions, 0 deletions