summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge preserve_ephemeral_rebuild tests between v2 & v2.112.0.0.0b1ghanshyam2015-06-247-161/+40
* Merge "Merge disk-config func test between v2 and v2.1"Jenkins2015-06-2442-1181/+121
|\
| * Merge disk-config func test between v2 and v2.1ghanshyam2015-06-1542-1181/+121
* | Merge "Fix testing object fields with missing instance rows"Jenkins2015-06-241-16/+22
|\ \
| * | Fix testing object fields with missing instance rowsDan Smith2015-06-231-16/+22
* | | Merge "Make resize api of compute manager to send flavor object"Jenkins2015-06-235-36/+114
|\ \ \ | |/ / |/| |
| * | Make resize api of compute manager to send flavor objectQin Zhao2015-06-185-36/+114
* | | Merge "Remove db layer hard-code permission checks for security_group_default...Jenkins2015-06-233-1/+8
|\ \ \
| * | | Remove db layer hard-code permission checks for security_group_default_rule_d...ShaoHe Feng2015-05-193-1/+8
* | | | Merge "Register the vnc config options under group 'vnc'"Jenkins2015-06-2313-75/+91
|\ \ \ \
| * | | | Register the vnc config options under group 'vnc'Diana Clarke2015-06-2213-75/+91
* | | | | Merge "Merge config_drive functional tests between v2 and v2.1"Jenkins2015-06-2314-279/+65
|\ \ \ \ \
| * | | | | Merge config_drive functional tests between v2 and v2.1ghanshyam2015-06-1514-279/+65
| | |_|_|/ | |/| | |
* | | | | Merge "Merge extension-info functional tests of v2 and v2.1"Jenkins2015-06-234-10/+13
|\ \ \ \ \
| * | | | | Merge extension-info functional tests of v2 and v2.1parklong2015-06-094-10/+13
* | | | | | Merge "cells: add devstack/tempest-dsvm-cells-rc for gating"Jenkins2015-06-231-0/+86
|\ \ \ \ \ \
| * | | | | | cells: add devstack/tempest-dsvm-cells-rc for gatingMatt Riedemann2015-06-231-0/+86
* | | | | | | Merge "Remove an useless variable and fix a typo in api"Jenkins2015-06-231-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove an useless variable and fix a typo in apiwangxiyuan2015-06-231-1/+1
* | | | | | | | Merge "Allow non-admin to list all tenants based on policy"Jenkins2015-06-235-3/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Allow non-admin to list all tenants based on policyDavanum Srinivas2015-06-185-3/+11
* | | | | | | | Merge "Fix up instance flavor usage in compute and network tests"Jenkins2015-06-237-36/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix up instance flavor usage in compute and network testsDan Smith2015-06-227-36/+45
* | | | | | | | | Merge "Fix up ec2 tests for flavors on instances"Jenkins2015-06-232-162/+172
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix up ec2 tests for flavors on instancesDan Smith2015-06-222-162/+172
* | | | | | | | | Merge "Fix up xenapi tests for instance flavors"Jenkins2015-06-221-40/+20
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix up xenapi tests for instance flavorsDan Smith2015-06-221-40/+20
* | | | | | | | | Merge "Fix up some bits of resource_tracker to use instance flavors"Jenkins2015-06-223-65/+42
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | / / / / / / | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix up some bits of resource_tracker to use instance flavorsDan Smith2015-06-223-65/+42
* | | | | | | | Merge "Cells: add in missing unit test for get_by_uuid"Jenkins2015-06-221-0/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Cells: add in missing unit test for get_by_uuidGary Kotton2015-06-221-0/+11
| |/ / / / / / /
* | | | | | | | Merge "Add flag to force experimental run of db contract"Jenkins2015-06-221-2/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Add flag to force experimental run of db contractPhilip Schwartz2015-06-221-2/+9
* | | | | | | | | Merge "Updated from global requirements"Jenkins2015-06-224-37/+36
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Updated from global requirementsOpenStack Proposal Bot2015-06-224-37/+36
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge "Add virt resource update to ComputeNode object"Jenkins2015-06-222-1/+101
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add virt resource update to ComputeNode objectPaul Murray2015-06-192-1/+101
| |/ / / / / / / /
* | | | | | | | | Merge "Remove db layer hard-code permission checks for network_create_safe"Jenkins2015-06-224-2/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove db layer hard-code permission checks for network_create_safeShaoHe Feng2015-05-184-2/+15
* | | | | | | | | | Merge "Pass project_id when create networks by os-tenant-networks"Jenkins2015-06-223-5/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Pass project_id when create networks by os-tenant-networksHe Jie Xu2015-05-183-5/+9
* | | | | | | | | | Merge "Disassociate before deleting network in os-tenant-networks delete method"Jenkins2015-06-223-13/+19
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Disassociate before deleting network in os-tenant-networks delete methodHe Jie Xu2015-05-183-13/+19
* | | | | | | | | | Merge "xenapi: remove bittorrent entry point lookup code"Jenkins2015-06-222-79/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | xenapi: remove bittorrent entry point lookup codeMatt Riedemann2015-06-182-79/+6
* | | | | | | | | | | Merge "Imported Translations from Transifex"Jenkins2015-06-2213-1835/+4308
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Imported Translations from TransifexOpenStack Proposal Bot2015-06-2213-1835/+4308
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "network: add more debug logging context for race bug 1249065"Jenkins2015-06-222-4/+18
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | network: add more debug logging context for race bug 1249065Matt Riedemann2015-06-192-4/+18
| |/ / / / / / / / /
* | | | | | | | | | Merge "Make readonly field tests use exception from oslo.versionedobjects"Jenkins2015-06-224-10/+7
|\ \ \ \ \ \ \ \ \ \