summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | update variable name after merge: flavor_node -> flavor_elemScott Moser2011-09-141-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | resolve conflicts / merge with trunk revno 1569Scott Moser2011-09-1472-2809/+2884
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | add attributes to xml apiScott Moser2011-09-141-0/+3
| * | | | | | | | | | | | | | | | | | | | | | | | fix white space for pep8Scott Moser2011-09-141-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | fix test_extensions test to know of new extension FlavorExtraDataScott Moser2011-09-141-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | add extension description for FlavorExtraDataScott Moser2011-09-141-0/+46
| * | | | | | | | | | | | | | | | | | | | | | | | make tests passScott Moser2011-09-132-4/+27
| * | | | | | | | | | | | | | | | | | | | | | | | add additional data to flavor's ViewBuilderScott Moser2011-09-131-0/+4
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Removing toprettyxml from OSAPI xml serialization in favor of toxml.Brian Waldon2011-09-153-19/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | removing toprettyxmlBrian Waldon2011-09-143-19/+13
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | The 1.1 API specifies that two vendor content types are allowed in addition t...Johannes Erdfelt2011-09-154-28/+101
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Don't report the wrong content type if a mapped type doesn't existJohannes Erdfelt2011-09-141-4/+4
| * | | | | | | | | | | | | | | | | | | | | | Test both content types for JSON and XMLJohannes Erdfelt2011-09-141-5/+15
| * | | | | | | | | | | | | | | | | | | | | | Remove unnecessary vendor content types now that they are mapped to standardJohannes Erdfelt2011-09-141-3/+0
| * | | | | | | | | | | | | | | | | | | | | | Add copyrightJohannes Erdfelt2011-09-141-0/+16
| * | | | | | | | | | | | | | | | | | | | | | Map vendor content types to their standard content type before serializingJohannes Erdfelt2011-09-141-16/+20
| * | | | | | | | | | | | | | | | | | | | | | Remove debuggingJohannes Erdfelt2011-09-141-1/+0
| * | | | | | | | | | | | | | | | | | | | | | Merge with trunkJohannes Erdfelt2011-09-1418-176/+388
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Fix mismergeJohannes Erdfelt2011-09-131-2/+0
| * | | | | | | | | | | | | | | | | | | | | | Merge with trunkJohannes Erdfelt2011-09-131-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Test new vendor content types as wellJohannes Erdfelt2011-09-131-0/+25
| * | | | | | | | | | | | | | | | | | | | | | | Split accept tests to better match the name of the testJohannes Erdfelt2011-09-131-9/+8
| * | | | | | | | | | | | | | | | | | | | | | | Remove debugging printJohannes Erdfelt2011-09-131-1/+0
| * | | | | | | | | | | | | | | | | | | | | | | Merge with trunkJohannes Erdfelt2011-09-1329-1323/+1436
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Actually test expected matches receivedJohannes Erdfelt2011-09-131-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | Test new content-typesJohannes Erdfelt2011-09-131-11/+14
| * | | | | | | | | | | | | | | | | | | | | | | | Merge with trunkJohannes Erdfelt2011-09-1355-1370/+1140
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Add support for vendor content typesJohannes Erdfelt2011-09-122-3/+24
* | | | | | | | | | | | | | | | | | | | | | | | | Fix issue where floating ips don't get recreated when a network host reboots.Vishvananda Ishaya2011-09-144-6/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | makes sure floating addresses are associated with host on associate so they c...Vishvananda Ishaya2011-09-134-6/+14
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Fixes an issue where 'invalid literal for int' would occur when listing image...Dan Prince2011-09-144-54/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge w/ trunk.Dan Prince2011-09-146-109/+124
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Make tests pass.Dan Prince2011-09-141-19/+19
| * | | | | | | | | | | | | | | | | | | | | | | Merge w/ trunk.Dan Prince2011-09-1450-2525/+2485
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | last of the api.openstack.test_images merge fixes.Dan Prince2011-09-131-6/+6
| * | | | | | | | | | | | | | | | | | | | | | | Merge w/ trunk.Dan Prince2011-09-134-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge with trunk. Still one test failure in test_images.Dan Prince2011-09-1380-1834/+3264
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Fixes an issue where 'invalid literal for int' would occur whenDan Prince2011-09-064-51/+118
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Update test_libvirt so that flags and fakes are used instead of mocks for uti...Dan Prince2011-09-142-55/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | pep8 fixes.Dan Prince2011-09-131-2/+3
| * | | | | | | | | | | | | | | | | | | | | | | Update test_libvirt so that flags and fakes are used instead of mocksDan Prince2011-09-132-55/+62
| | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Multi-NIC support for vmwareapi virt driver in nova.sateesh2011-09-146-109/+124
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Multi-NIC support for vmwareapi virt driver in nova.sateesh2011-09-056-109/+124
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | * tests working againSandy Walsh2011-09-152-3/+4
| | | | | | | | | | | | | | | | | | | | | * exceptions properly passed around nowSandy Walsh2011-09-152-3/+55
| | | | | | | | | | | | | | | | | | | | | * pep8Sandy Walsh2011-09-152-1/+3
| | | | | | | | | | | | | | | | | | | | | * tests are backSandy Walsh2011-09-143-22/+45
| | | | | | | | | | | | | | | | | | | | | * trunk mergeSandy Walsh2011-09-1353-2482/+2493
| | | | | | | | | | | | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Deprecate aoe in preperation for removal in essex.Vishvananda Ishaya2011-09-131-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | deprecate aoeVishvananda Ishaya2011-09-131-1/+8
| | |_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |