summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | Fix use of stale instance data in compute managerChris Behrens2013-01-122-180/+152
| | |_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Convert ConfigDriveHelper to being a context manager itself."Jenkins2013-01-136-18/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Convert ConfigDriveHelper to being a context manager itself.Michael Still2013-01-136-18/+19
| | |_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Upgrade WebOb to 1.2.3"Jenkins2013-01-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Upgrade WebOb to 1.2.3Doug Hellmann2013-01-071-1/+1
* | | | | | | | | | | | | | | | | | | Merge "Fix error in NovaBase.save() method"Jenkins2013-01-131-2/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix error in NovaBase.save() methodBoris Pavlovic2013-01-121-2/+11
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Fix quota updating when admin deletes common user's instance"Jenkins2013-01-136-61/+144
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix quota updating when admin deletes common user's instanceyugsuo2013-01-116-61/+144
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Handle directory conflicts with html output."Jenkins2013-01-131-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Handle directory conflicts with html output.Matthew Treinish2013-01-111-0/+3
* | | | | | | | | | | | | | | | | | | Move migration_create() to conductorDan Smith2013-01-126-13/+63
| |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "Allow pinging own float when using fixed gateway"Jenkins2013-01-121-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Allow pinging own float when using fixed gatewayVishvananda Ishaya2013-01-041-4/+10
* | | | | | | | | | | | | | | | | | | Merge "Fix lintstack check for multi-patch reviews"Jenkins2013-01-121-4/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix lintstack check for multi-patch reviewsYun Mao2013-01-081-4/+22
* | | | | | | | | | | | | | | | | | | | Merge "xenapi: Remove dead code, moves, tests"Jenkins2013-01-123-87/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | xenapi: Remove dead code, moves, testsMate Lakat2013-01-083-87/+83
* | | | | | | | | | | | | | | | | | | | | Merge "Added sample tests to FlavorSwap API."Jenkins2013-01-1217-1/+421
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Added sample tests to FlavorSwap API.Giampaolo Lauria2013-01-0917-1/+421
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge "Remove more unused opts from nova.scheduler.driver"Jenkins2013-01-121-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Remove more unused opts from nova.scheduler.driverMark McLoughlin2013-01-111-2/+0
| | |_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge "Add service_destroy to conductor."Jenkins2013-01-125-4/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | 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