Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge preserve_ephemeral_rebuild tests between v2 & v2.112.0.0.0b1 | ghanshyam | 2015-06-24 | 7 | -161/+40 |
* | Merge "Merge disk-config func test between v2 and v2.1" | Jenkins | 2015-06-24 | 42 | -1181/+121 |
|\ | |||||
| * | Merge disk-config func test between v2 and v2.1 | ghanshyam | 2015-06-15 | 42 | -1181/+121 |
* | | Merge "Fix testing object fields with missing instance rows" | Jenkins | 2015-06-24 | 1 | -16/+22 |
|\ \ | |||||
| * | | Fix testing object fields with missing instance rows | Dan Smith | 2015-06-23 | 1 | -16/+22 |
* | | | Merge "Make resize api of compute manager to send flavor object" | Jenkins | 2015-06-23 | 5 | -36/+114 |
|\ \ \ | |/ / |/| | | |||||
| * | | Make resize api of compute manager to send flavor object | Qin Zhao | 2015-06-18 | 5 | -36/+114 |
* | | | Merge "Remove db layer hard-code permission checks for security_group_default... | Jenkins | 2015-06-23 | 3 | -1/+8 |
|\ \ \ | |||||
| * | | | Remove db layer hard-code permission checks for security_group_default_rule_d... | ShaoHe Feng | 2015-05-19 | 3 | -1/+8 |
* | | | | Merge "Register the vnc config options under group 'vnc'" | Jenkins | 2015-06-23 | 13 | -75/+91 |
|\ \ \ \ | |||||
| * | | | | Register the vnc config options under group 'vnc' | Diana Clarke | 2015-06-22 | 13 | -75/+91 |
* | | | | | Merge "Merge config_drive functional tests between v2 and v2.1" | Jenkins | 2015-06-23 | 14 | -279/+65 |
|\ \ \ \ \ | |||||
| * | | | | | Merge config_drive functional tests between v2 and v2.1 | ghanshyam | 2015-06-15 | 14 | -279/+65 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge "Merge extension-info functional tests of v2 and v2.1" | Jenkins | 2015-06-23 | 4 | -10/+13 |
|\ \ \ \ \ | |||||
| * | | | | | Merge extension-info functional tests of v2 and v2.1 | parklong | 2015-06-09 | 4 | -10/+13 |
* | | | | | | Merge "cells: add devstack/tempest-dsvm-cells-rc for gating" | Jenkins | 2015-06-23 | 1 | -0/+86 |
|\ \ \ \ \ \ | |||||
| * | | | | | | cells: add devstack/tempest-dsvm-cells-rc for gating | Matt Riedemann | 2015-06-23 | 1 | -0/+86 |
* | | | | | | | Merge "Remove an useless variable and fix a typo in api" | Jenkins | 2015-06-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove an useless variable and fix a typo in api | wangxiyuan | 2015-06-23 | 1 | -1/+1 |
* | | | | | | | | Merge "Allow non-admin to list all tenants based on policy" | Jenkins | 2015-06-23 | 5 | -3/+11 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Allow non-admin to list all tenants based on policy | Davanum Srinivas | 2015-06-18 | 5 | -3/+11 |
* | | | | | | | | Merge "Fix up instance flavor usage in compute and network tests" | Jenkins | 2015-06-23 | 7 | -36/+45 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix up instance flavor usage in compute and network tests | Dan Smith | 2015-06-22 | 7 | -36/+45 |
* | | | | | | | | | Merge "Fix up ec2 tests for flavors on instances" | Jenkins | 2015-06-23 | 2 | -162/+172 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Fix up ec2 tests for flavors on instances | Dan Smith | 2015-06-22 | 2 | -162/+172 |
* | | | | | | | | | Merge "Fix up xenapi tests for instance flavors" | Jenkins | 2015-06-22 | 1 | -40/+20 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Fix up xenapi tests for instance flavors | Dan Smith | 2015-06-22 | 1 | -40/+20 |
* | | | | | | | | | Merge "Fix up some bits of resource_tracker to use instance flavors" | Jenkins | 2015-06-22 | 3 | -65/+42 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | / / / / / / | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix up some bits of resource_tracker to use instance flavors | Dan Smith | 2015-06-22 | 3 | -65/+42 |
* | | | | | | | | Merge "Cells: add in missing unit test for get_by_uuid" | Jenkins | 2015-06-22 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Cells: add in missing unit test for get_by_uuid | Gary Kotton | 2015-06-22 | 1 | -0/+11 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge "Add flag to force experimental run of db contract" | Jenkins | 2015-06-22 | 1 | -2/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add flag to force experimental run of db contract | Philip Schwartz | 2015-06-22 | 1 | -2/+9 |
* | | | | | | | | | Merge "Updated from global requirements" | Jenkins | 2015-06-22 | 4 | -37/+36 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Updated from global requirements | OpenStack Proposal Bot | 2015-06-22 | 4 | -37/+36 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge "Add virt resource update to ComputeNode object" | Jenkins | 2015-06-22 | 2 | -1/+101 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add virt resource update to ComputeNode object | Paul Murray | 2015-06-19 | 2 | -1/+101 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge "Remove db layer hard-code permission checks for network_create_safe" | Jenkins | 2015-06-22 | 4 | -2/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Remove db layer hard-code permission checks for network_create_safe | ShaoHe Feng | 2015-05-18 | 4 | -2/+15 |
* | | | | | | | | | | Merge "Pass project_id when create networks by os-tenant-networks" | Jenkins | 2015-06-22 | 3 | -5/+9 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Pass project_id when create networks by os-tenant-networks | He Jie Xu | 2015-05-18 | 3 | -5/+9 |
* | | | | | | | | | | Merge "Disassociate before deleting network in os-tenant-networks delete method" | Jenkins | 2015-06-22 | 3 | -13/+19 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Disassociate before deleting network in os-tenant-networks delete method | He Jie Xu | 2015-05-18 | 3 | -13/+19 |
* | | | | | | | | | | Merge "xenapi: remove bittorrent entry point lookup code" | Jenkins | 2015-06-22 | 2 | -79/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | xenapi: remove bittorrent entry point lookup code | Matt Riedemann | 2015-06-18 | 2 | -79/+6 |
* | | | | | | | | | | | Merge "Imported Translations from Transifex" | Jenkins | 2015-06-22 | 13 | -1835/+4308 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Imported Translations from Transifex | OpenStack Proposal Bot | 2015-06-22 | 13 | -1835/+4308 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge "network: add more debug logging context for race bug 1249065" | Jenkins | 2015-06-22 | 2 | -4/+18 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | network: add more debug logging context for race bug 1249065 | Matt Riedemann | 2015-06-19 | 2 | -4/+18 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge "Make readonly field tests use exception from oslo.versionedobjects" | Jenkins | 2015-06-22 | 4 | -10/+7 |
|\ \ \ \ \ \ \ \ \ \ |