summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge "Deprecate xenserver.vif_driver config option and change default" into ...15.0.0.0rc215.0.0Jenkins2017-02-173-6/+42
|\
| * Deprecate xenserver.vif_driver config option and change defaultMatt Riedemann2017-02-163-6/+42
* | Merge "Fix live migrate with XenServer" into stable/ocataJenkins2017-02-1710-65/+323
|\ \ | |/
| * Fix live migrate with XenServerHuan Xie2017-02-1610-65/+323
* | Merge "Add Cells V1 -> Cells V2 step-by-step example" into stable/ocataJenkins2017-02-161-0/+106
|\ \
| * | Add Cells V1 -> Cells V2 step-by-step examplemelanie witt2017-02-101-0/+106
* | | Merge "Enable defaults for cell_v2 update_cell command" into stable/ocataJenkins2017-02-163-5/+30
|\ \ \ | |_|/ |/| |
| * | Enable defaults for cell_v2 update_cell commandCorey Bryant2017-02-153-5/+30
* | | Merge "Cleanup some issues with CONF.placement.os_interface" into stable/ocataJenkins2017-02-157-15/+55
|\ \ \ | |/ / |/| |
| * | Cleanup some issues with CONF.placement.os_interfaceMatt Riedemann2017-02-157-15/+55
* | | Merge "Allow placement endpoint interface to be set" into stable/ocataJenkins2017-02-153-1/+16
|\ \ \ | |/ /
| * | Allow placement endpoint interface to be setAndy McCrae2017-02-153-1/+16
* | | Merge "allocations.consumer_id is not used in query." into stable/ocataJenkins2017-02-151-1/+0
|\ \ \ | |/ / |/| |
| * | allocations.consumer_id is not used in query.smccully2017-02-141-1/+0
| |/
* | Merge "Remove straggling use of main db flavors in cellsv1 code" into stable/...Jenkins2017-02-152-10/+12
|\ \
| * | Remove straggling use of main db flavors in cellsv1 codeDan Smith2017-02-112-10/+12
| |/
* | Merge "Default live_migration_progress_timeout to off" into stable/ocataJenkins2017-02-152-4/+37
|\ \
| * | Default live_migration_progress_timeout to offJohn Garbutt2017-02-092-4/+37
* | | Skip test_stamp_pattern in cells v1 jobMatt Riedemann2017-02-141-0/+3
| |/ |/|
* | Merge "Edits for Cells V2 step-by-step examples" into stable/ocataJenkins2017-02-101-15/+24
|\ \
| * | Edits for Cells V2 step-by-step examplesmelanie witt2017-02-091-15/+24
* | | Merge "Add step-by-step examples for Cells V2 setup" into stable/ocataJenkins2017-02-101-0/+106
|\ \ \ | |/ /
| * | Add step-by-step examples for Cells V2 setupmelanie witt2017-02-071-0/+106
* | | Merge "Add an update_cell command to nova-manage" into stable/ocataJenkins2017-02-103-0/+86
|\ \ \
| * | | Add an update_cell command to nova-manageDan Smith2017-02-093-0/+86
| | |/ | |/|
* | | Merge "Allow None for block_device_mapping_v2.boot_index" into stable/ocataJenkins2017-02-104-2/+65
|\ \ \
| * | | Allow None for block_device_mapping_v2.boot_indexMatt Riedemann2017-02-094-2/+65
| |/ /
* | | Prepare for using standard python testsAndreas Jaeger2017-02-092-0/+58
|/ /
* | Merge "Clarify the deployment of placement for cellsv1 users" into stable/ocataJenkins2017-02-081-0/+2
|\ \
| * | Clarify the deployment of placement for cellsv1 usersDan Smith2017-02-061-0/+2
* | | Merge "Update the upgrades part of devref" into stable/ocataJenkins2017-02-081-68/+70
|\ \ \ | |_|/ |/| |
| * | Update the upgrades part of devrefDan Smith2017-02-061-68/+70
| |/
* | Update UPPER_CONSTRAINTS_FILE for stable/ocataOpenStack Release Bot2017-02-031-1/+1
* | Update .gitreview for stable/ocataOpenStack Release Bot2017-02-031-0/+1
|/
* Merge "Delete a compute node's resource provider when node is deleted"15.0.0.0rc1Jenkins2017-02-035-1/+136
|\
| * Delete a compute node's resource provider when node is deletedEdLeafe2017-02-035-1/+136
* | Merge "libvirt: workaround findmnt behaviour change"Jenkins2017-02-036-30/+76
|\ \ | |/ |/|
| * libvirt: workaround findmnt behaviour changeLee Yarwood2017-01-166-30/+76
* | Merge "Removes unnecessary utf-8 encoding"Jenkins2017-02-039-17/+0
|\ \
| * | Removes unnecessary utf-8 encodingCao Xuan Hoang2016-12-209-17/+0
* | | Merge "libvirt: Limit destroying disks during cleanup to spawn"Jenkins2017-02-032-13/+41
|\ \ \
| * | | libvirt: Limit destroying disks during cleanup to spawnLee Yarwood2017-01-312-13/+41
* | | | Merge "Clarify the language in the apache wsgi sample"Jenkins2017-02-031-0/+6
|\ \ \ \
| * | | | Clarify the language in the apache wsgi sampleDan Smith2017-02-021-0/+6
* | | | | Merge "Mark compute/placement REST API max microversions for Ocata"Jenkins2017-02-032-4/+4
|\ \ \ \ \
| * | | | | Mark compute/placement REST API max microversions for OcataMatt Riedemann2017-02-022-4/+4
| |/ / / /
* | | | | Merge "Add release note for filter/sort whitelist"Jenkins2017-02-031-0/+115
|\ \ \ \ \
| * | | | | Add release note for filter/sort whitelistKevin_Zheng2017-02-021-0/+115
| |/ / / /
* | | | | Merge "Clarify the [cells] config option help"Jenkins2017-02-031-1/+12
|\ \ \ \ \
| * | | | | Clarify the [cells] config option helpMatt Riedemann2017-02-021-1/+12