summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Merge "Fix console support with cells"Jenkins2013-03-1914-28/+283
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix console support with cellsChris Behrens2013-03-1914-28/+283
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Prevent volume-attach/detach from instances in rescue state"Jenkins2013-03-194-9/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Prevent volume-attach/detach from instances in rescue stateJoe Gordon2013-03-184-9/+74
* | | | | | | | | | | | | Merge "Ensure that headers are returned as strings, not integers."Jenkins2013-03-194-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Ensure that headers are returned as strings, not integers.Alvaro Lopez Garcia2013-03-194-3/+9
* | | | | | | | | | | | | Fix multiple fixed-ips with quantum.Russell Bryant2013-03-191-1/+2
| |_|_|/ / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge "xenapi: Adding logging for migration plugin"Jenkins2013-03-192-4/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | xenapi: Adding logging for migration pluginAndy Hill2013-03-182-4/+17
* | | | | | | | | | | | | Merge "Return error details to users in "dns-create-private-domain""Jenkins2013-03-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Return error details to users in "dns-create-private-domain"Haiwei Xu2013-03-131-3/+5
* | | | | | | | | | | | | | Merge "Fixes PowerVM spawn failed as missing attr supported_instances"Jenkins2013-03-193-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixes PowerVM spawn failed as missing attr supported_instancesFei Long Wang2013-03-193-0/+25
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Fix RequestContext crashes w/ no service catalog"Jenkins2013-03-192-3/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix RequestContext crashes w/ no service catalogDavanum Srinivas2013-03-182-3/+17
* | | | | | | | | | | | | | | Merge "Require netaddr>=0.7.6 to avoid UnboundLocalError"Jenkins2013-03-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | / / / / / / / | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Require netaddr>=0.7.6 to avoid UnboundLocalErrorAlessio Ababilov2013-03-191-1/+1
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Fix more OS-DCF:diskConfig XML handling"Jenkins2013-03-192-2/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix more OS-DCF:diskConfig XML handlingChristopher Yeoh2013-03-132-2/+74
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "libvirt: Tolerate existing vm(s) with cdrom(s)"Jenkins2013-03-191-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | libvirt: Tolerate existing vm(s) with cdrom(s)Davanum Srinivas2013-03-181-0/+6
* | | | | | | | | | | | | Merge "LibvirtGenericVIFDriver update for stp"Jenkins2013-03-191-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | LibvirtGenericVIFDriver update for stpGary Kotton2013-03-131-0/+2
* | | | | | | | | | | | | Merge "Fix XenAPI performance issue"Jenkins2013-03-183-0/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix XenAPI performance issueChris Behrens2013-03-183-0/+31
* | | | | | | | | | | | | | Merge "Remove unused virt.disk.api methods bind/unbind"Jenkins2013-03-181-13/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove unused virt.disk.api methods bind/unbindmathrock2013-03-171-13/+0
* | | | | | | | | | | | | | Merge "Remove dead code."Jenkins2013-03-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove dead code.Russell Bryant2013-03-171-1/+1
* | | | | | | | | | | | | | Merge "Fix issues with cells and resize"Jenkins2013-03-181-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix issues with cells and resizeChris Behrens2013-03-131-7/+8
* | | | | | | | | | | | | | | Merge "Reset migrating task state for more Exceptions"Jenkins2013-03-181-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Reset migrating task state for more ExceptionsAndrew Laski2013-03-151-1/+3
* | | | | | | | | | | | | | | | Merge "Check keypair destroy result operation"Jenkins2013-03-172-4/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Check keypair destroy result operationMauro S. M. Rodrigues2013-03-142-4/+51
* | | | | | | | | | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-03-171-161/+219
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-03-171-161/+219
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Add standard methods to the Limits API"Jenkins2013-03-172-6/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Add standard methods to the Limits APIGiampaolo Lauria2013-03-152-6/+49
* | | | | | | | | | | | | | | | | Merge "Revert "Remove the usage of instance['extra_specs'"Jenkins2013-03-173-16/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Revert "Remove the usage of instance['extra_specs'Dan Prince2013-03-163-16/+8
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Fix use of libvirt_disk_prefix"Jenkins2013-03-172-9/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fix use of libvirt_disk_prefixJim Fehlig2013-03-152-9/+30
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Store project_id for instance actions"Jenkins2013-03-171-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Store project_id for instance actionsAndrew Laski2013-03-151-0/+1
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "rstrip() strips characters, not strings"Jenkins2013-03-171-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | rstrip() strips characters, not stringsJohannes Erdfelt2013-03-151-1/+4
* | | | | | | | | | | | | | | | | | Merge "Update migration 153 for efficiency."Jenkins2013-03-172-8/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Update migration 153 for efficiency.Brian Lamar2013-03-142-8/+13
* | | | | | | | | | | | | | | | | | | Merge "Make ssh key injection work with xenapi agent"Jenkins2013-03-173-11/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |