summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Port rescue API to v3 Part 2"Jenkins2013-06-245-18/+21
|\
| * Port rescue API to v3 Part 2Chris Yeoh2013-06-075-18/+21
* | Merge "Port rescue API to v3 Part 1"Jenkins2013-06-242-0/+226
|\|
| * Port rescue API to v3 Part 1Chris Yeoh2013-06-072-0/+226
* | Merge "Cleanup overshadowing in test_evacuate.py"Jenkins2013-06-242-20/+20
|\ \
| * | Cleanup overshadowing in test_evacuate.pyChris Yeoh2013-06-122-20/+20
* | | Merge "Port evacuate API to v3 Part 2"Jenkins2013-06-245-20/+27
|\| |
| * | Port evacuate API to v3 Part 2Chris Yeoh2013-06-075-20/+27
* | | Merge "Port evacuate API to v3 Part 1"Jenkins2013-06-242-0/+295
|\| |
| * | Port evacuate API to v3 Part 1Chris Yeoh2013-06-072-0/+295
| |/
* | Merge "Do not raise NEW exceptions"Jenkins2013-06-246-30/+41
|\ \
| * | Do not raise NEW exceptionsBoris Pavlovic2013-06-226-30/+41
* | | Merge "Fix xenstore-rm race condition"Jenkins2013-06-241-1/+7
|\ \ \
| * | | Fix xenstore-rm race conditionChris Behrens2013-06-231-1/+7
* | | | Merge "Quantumapi returns an empty network list"Jenkins2013-06-242-1/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Quantumapi returns an empty network listÉdouard Thuleau2013-06-122-1/+8
* | | | Merge "Fix sys_meta access in prep for instance object"Jenkins2013-06-226-22/+18
|\ \ \ \
| * | | | Fix sys_meta access in prep for instance objectChris Behrens2013-06-216-22/+18
* | | | | Merge "Port missing bits from httplib2 to requests"Jenkins2013-06-223-12/+9
|\ \ \ \ \
| * | | | | Port missing bits from httplib2 to requestsSascha Peilicke2013-06-213-12/+9
* | | | | | Merge "Fix KeyError exception when scheduling to child cell."Jenkins2013-06-212-8/+9
|\ \ \ \ \ \
| * | | | | | Fix KeyError exception when scheduling to child cell.Yaguang Tang2013-06-212-8/+9
* | | | | | | Merge "Fix quota logging on exceptions"Jenkins2013-06-211-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix quota logging on exceptionsChris Behrens2013-06-211-0/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge "Remove locals() from nova/virt/libvirt package"Jenkins2013-06-213-72/+95
|\ \ \ \ \ \ \
| * | | | | | | Remove locals() from nova/virt/libvirt packageEugene Nikanorov2013-06-213-72/+95
| |/ / / / / /
* | | | | | | Merge "Cleanup certificate API extension"Jenkins2013-06-212-22/+4
|\ \ \ \ \ \ \
| * | | | | | | Cleanup certificate API extensionChris Yeoh2013-06-152-22/+4
* | | | | | | | Merge "Port certificates API to v3 Part 2"Jenkins2013-06-215-15/+19
|\| | | | | | | | |_|/ / / / / |/| | | | | |
| * | | | | | Port certificates API to v3 Part 2Chris Yeoh2013-06-135-15/+19
* | | | | | | Merge "Allow reboot or rebuild from vm_state=Error"Jenkins2013-06-216-14/+143
|\ \ \ \ \ \ \
| * | | | | | | Allow reboot or rebuild from vm_state=ErrorPhil Day2013-06-166-14/+143
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge "Setting static ip= for baremetal PXE boot."Jenkins2013-06-219-66/+89
|\ \ \ \ \ \ \
| * | | | | | | Setting static ip= for baremetal PXE boot.Lucas Alvares Gomes2013-06-189-66/+89
* | | | | | | | Merge "Fix importing InstanceInfoCache during register_all()"Jenkins2013-06-211-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix importing InstanceInfoCache during register_all()Dan Smith2013-06-201-0/+1
* | | | | | | | | Merge "Make _poll_unconfirmed_resizes() use objects"Jenkins2013-06-214-19/+30
|\| | | | | | | |
| * | | | | | | | Make _poll_unconfirmed_resizes() use objectsDan Smith2013-06-204-19/+30
* | | | | | | | | Make sure instance_type has extra_specsChris Behrens2013-06-205-12/+31
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge "Remove the unused plugins framework"Jenkins2013-06-218-374/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove the unused plugins frameworkMark McLoughlin2013-06-198-374/+0
* | | | | | | | | Merge "Port certificates API to v3 Part 1"Jenkins2013-06-212-0/+182
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Port certificates API to v3 Part 1Chris Yeoh2013-06-132-0/+182
* | | | | | | | Revert "Add oslo-config-1.2.0a2 and pbr>=0.5.16 to requirements."Dan Smith2013-06-201-1/+1
* | | | | | | | Merge "Remove db session hack from conductor's vol_usage_update()"Jenkins2013-06-204-13/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove db session hack from conductor's vol_usage_update()Dan Smith2013-06-184-13/+8
* | | | | | | | | Merge "Revert "Initial scheduler support for instance_groups""Jenkins2013-06-207-158/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Initial scheduler support for instance_groups"Russell Bryant2013-06-207-158/+25
* | | | | | | | | | Merge "Remove a layer of nesting in _poll_unconfirmed_resizes()"Jenkins2013-06-201-56/+58
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove a layer of nesting in _poll_unconfirmed_resizes()Dan Smith2013-06-191-56/+58