summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | Fix uses of service_get_all_compute_by_hostChris Behrens2013-01-1414-134/+140
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "VMware Compute Driver Rename"Jenkins2013-01-1415-117/+114
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | VMware Compute Driver RenameSean Chen2013-01-1415-117/+114
| | |_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Keep self and context out of error notification payload."Jenkins2013-01-147-57/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Keep self and context out of error notification payload.Sandy Walsh2013-01-147-57/+12
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Extract validation and provision code to separate method"Jenkins2013-01-141-29/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Extract validation and provision code to separate methodGary Kotton2013-01-141-29/+56
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "instances_path is now defined here."Jenkins2013-01-141-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | instances_path is now defined here.Michael Still2013-01-131-4/+0
* | | | | | | | | | | | | | | | | | | Merge "Fix incorrect comment, and move a variable close to use."Jenkins2013-01-141-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix incorrect comment, and move a variable close to use.Michael Still2013-01-121-5/+1
* | | | | | | | | | | | | | | | | | | | Populate service list with availability zoneMichael J Fork2013-01-141-0/+2
| |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Fix pyflakes issues in integrated tests"Jenkins2013-01-142-7/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix pyflakes issues in integrated testsChris Behrens2013-01-092-8/+6
| | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "Make it clearer that network.api.API is nova-network specific."Jenkins2013-01-141-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Make it clearer that network.api.API is nova-network specific.Robert Collins2013-01-111-1/+5
* | | | | | | | | | | | | | | | | | | Merge "Make Quantum plugin fill in the 'bridge' name"Jenkins2013-01-143-27/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Make Quantum plugin fill in the 'bridge' nameDaniel P. Berrange2013-01-103-27/+41
* | | | | | | | | | | | | | | | | | | Merge "Make nova network manager fill in vif_type"Jenkins2013-01-142-1/+3
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Make nova network manager fill in vif_typeDaniel P. Berrange2013-01-102-1/+3
* | | | | | | | | | | | | | | | | | | Merge "Add some constants to the network model for drivers to use"Jenkins2013-01-141-0/+11
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Add some constants to the network model for drivers to useDaniel P. Berrange2013-01-101-0/+11
* | | | | | | | | | | | | | | | | | | Merge "Move libvirt VIF XML config into designer.py"Jenkins2013-01-143-36/+138
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Move libvirt VIF XML config into designer.pyDaniel P. Berrange2013-01-103-36/+138
* | | | | | | | | | | | | | | | | | | Merge "Use testr setuptools commands."Jenkins2013-01-143-11/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Use testr setuptools commands.Monty Taylor2013-01-123-11/+9
* | | | | | | | | | | | | | | | | | | Merge "Fix use of stale instance data in compute manager"Jenkins2013-01-132-180/+152
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \