summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Make ssh key injection work with xenapi agentChris Behrens2013-03-133-11/+63
* | | | | | | | | | | | | | | | | | | Merge "Remove the usage of instance['extra_specs']."Jenkins2013-03-163-8/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Remove the usage of instance['extra_specs'].Yaguang Tang2013-03-123-8/+16
* | | | | | | | | | | | | | | | | | | Merge "Revert 1154253 causes XenServer image compat issue"Jenkins2013-03-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Revert 1154253 causes XenServer image compat issueDan Prince2013-03-151-1/+1
* | | | | | | | | | | | | | | | | | | | Merge "Fix db archiving bug with foreign key constraints."Jenkins2013-03-152-9/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Fix db archiving bug with foreign key constraints.David Ripton2013-03-152-9/+59
| | |_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "Make os-services API extensions consistent."Jenkins2013-03-1511-41/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Make os-services API extensions consistent.Dan Prince2013-03-1411-41/+51
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Make conductor's quota methods pass project_id properly"Jenkins2013-03-155-81/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Make conductor's quota methods pass project_id properlyDan Smith2013-03-145-81/+42
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "Fix: improve API error responses from os-hosts extension"Jenkins2013-03-152-10/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix: improve API error responses from os-hosts extensionHans Lindgren2013-03-142-10/+46
* | | | | | | | | | | | | | | | | | | | Merge "Drop gzip flag from tar command for OVF archives"Jenkins2013-03-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Drop gzip flag from tar command for OVF archivesGreg Ball2013-03-131-1/+1