summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | Add service_destroy to conductor.Russell Bryant2013-01-115-4/+30
* | | | | | | | | | | | | | | | | | | | | | Merge "Make nova.service get service through conductor."Jenkins2013-01-126-10/+29
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Make nova.service get service through conductor.Russell Bryant2013-01-116-10/+29
* | | | | | | | | | | | | | | | | | | | | | Merge "Add service_create to conductor."Jenkins2013-01-126-8/+30
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Add service_create to conductor.Russell Bryant2013-01-116-8/+30
* | | | | | | | | | | | | | | | | | | | | | Merge "Handle waiting for conductor in nova.service."Jenkins2013-01-124-13/+18
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Handle waiting for conductor in nova.service.Russell Bryant2013-01-114-13/+18
* | | | | | | | | | | | | | | | | | | | | | Merge "Allow forcing local conductor."Jenkins2013-01-122-1/+7
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Allow forcing local conductor.Russell Bryant2013-01-112-1/+7
* | | | | | | | | | | | | | | | | | | | | | Merge "Make pinging conductor a part of conductor API."Jenkins2013-01-124-41/+61
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Make pinging conductor a part of conductor API.Russell Bryant2013-01-114-41/+61
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix some conductor manager return values."Jenkins2013-01-121-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Fix some conductor manager return values.Russell Bryant2013-01-111-2/+4
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "Skip domains on libvirt errors in get_vcpu_used()"Jenkins2013-01-121-9/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Skip domains on libvirt errors in get_vcpu_used()Matthew Treinish2013-01-111-9/+20
* | | | | | | | | | | | | | | | | | | | | Merge "Adding configdrive to xenapi."Jenkins2013-01-114-10/+159
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Adding configdrive to xenapi.Michael Still2013-01-114-10/+159
* | | | | | | | | | | | | | | | | | | | | | Merge "Correct the calculating of disk size when using lvm disk backend."Jenkins2013-01-112-4/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Correct the calculating of disk size when using lvm disk backend.zhoudongshu2013-01-112-4/+44
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge "Fix test cases in integrated.test_multiprocess_api"Jenkins2013-01-111-28/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Fix test cases in integrated.test_multiprocess_apiHengqing Hu2013-01-101-28/+26
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "Remove bogus 'unplug' calls from libvirt VIF test"Jenkins2013-01-111-17/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Remove bogus 'unplug' calls from libvirt VIF testDaniel P. Berrange2013-01-101-17/+0
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Cleanup pyflakes in nova-manage"Jenkins2013-01-111-4/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Cleanup pyflakes in nova-manageJoe Gordon2013-01-101-4/+1
* | | | | | | | | | | | | | | | | | | Merge "Fix libvirt resume function call to get_domain_xml"Jenkins2013-01-111-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix libvirt resume function call to get_domain_xmlRafi Khardalian2013-01-101-2/+1
* | | | | | | | | | | | | | | | | | | | Merge "Add host name to log message for _local_delete"Jenkins2013-01-111-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add host name to log message for _local_deleteJian Wen2013-01-101-2/+2
* | | | | | | | | | | | | | | | | | | | Merge "Create a directory for servicegroup drivers."Jenkins2013-01-113-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Create a directory for servicegroup drivers.Russell Bryant2013-01-103-1/+3
| | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Move logic from os-api-host into compute"Jenkins2013-01-119-236/+505
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Move logic from os-api-host into computeMatthew Sherborne2013-01-119-236/+505
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Access instance as dict, not object in xenapi"Jenkins2013-01-112-16/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Access instance as dict, not object in xenapiChris Behrens2013-01-112-16/+6
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge "Move update_instance_info_cache to conductor."Jenkins2013-01-118-35/+101
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Move update_instance_info_cache to conductor.Chris Behrens2013-01-108-35/+101
* | | | | | | | | | | | | | | | | | | Change ComputerDriver.legacy_nwinfo to raise by default.Robert Collins2013-01-116-5/+22
| |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "Update instance's cell_name in API cell."Jenkins2013-01-102-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Update instance's cell_name in API cell.Chris Behrens2013-01-102-6/+7
| | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "Add user/tenant shim to RequestContext"Jenkins2013-01-101-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Add user/tenant shim to RequestContextRick Harris2013-01-101-1/+16
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "make runtests -p act more like tox"Jenkins2013-01-102-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | make runtests -p act more like toxSean Dague2013-01-102-6/+12
* | | | | | | | | | | | | | | | | | Merge "fix new N402 errors"Jenkins2013-01-1016-55/+53
|\| | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | fix new N402 errorsSean Dague2013-01-1016-55/+53
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "Fixed comment typo"Jenkins2013-01-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fixed comment typoGiampaolo Lauria2013-01-091-1/+1
* | | | | | | | | | | | | | | | | Merge "Fix init_host checking moved instances"Jenkins2013-01-104-304/+167
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix init_host checking moved instancesChris Behrens2013-01-104-304/+167
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |