diff options
| author | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-03-09 16:32:06 -0500 |
|---|---|---|
| committer | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-03-09 16:32:06 -0500 |
| commit | 95d25ba3f4cd3345355922018295f3789d5ddb7c (patch) | |
| tree | 83c37b89d96150fd7d7bc04459b5e3b62986f1ad /nova/api | |
| parent | 82c4d6309909d6508df0944683ce4d3d7341de10 (diff) | |
| parent | 5662a822a013bd0d159c15b990231c4d1f12797f (diff) | |
| download | nova-95d25ba3f4cd3345355922018295f3789d5ddb7c.tar.gz nova-95d25ba3f4cd3345355922018295f3789d5ddb7c.tar.xz nova-95d25ba3f4cd3345355922018295f3789d5ddb7c.zip | |
merge lp:nova and resolve conflicts
Diffstat (limited to 'nova/api')
0 files changed, 0 insertions, 0 deletions