summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge "Updated from global requirements"Jenkins2016-08-242-2/+2
|\
| * Updated from global requirementsOpenStack Proposal Bot2016-08-242-2/+2
* | Merge "Refactor validate_resource_definitions()"Jenkins2016-08-241-53/+9
|\ \
| * | Refactor validate_resource_definitions()huangtianhua2016-08-231-53/+9
* | | Merge "Load resources from DB for resource list"Jenkins2016-08-244-79/+99
|\ \ \
| * | | Load resources from DB for resource listSteve Baker2016-08-154-79/+99
* | | | Merge "Use a variable for which conf file to write to"Jenkins2016-08-241-11/+11
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use a variable for which conf file to write toSteve Baker2016-08-131-11/+11
* | | | Merge "Migrate stacks from legacy to convergence engine"Jenkins2016-08-2310-8/+188
|\ \ \ \
| * | | | Migrate stacks from legacy to convergence engineOleksii Chuprykov2016-08-2210-8/+188
* | | | | Merge "Delete RoleAssignment if user/group does not exist"Jenkins2016-08-234-16/+45
|\ \ \ \ \
| * | | | | Delete RoleAssignment if user/group does not existrabi2016-08-234-16/+45
| | |_|_|/ | |/| | |
* | | | | Merge "api-ref - software config status codes"Jenkins2016-08-231-18/+118
|\ \ \ \ \
| * | | | | api-ref - software config status codestengqm2016-08-221-18/+118
* | | | | | Merge "api-ref - template version and functions"Jenkins2016-08-233-31/+137
|\ \ \ \ \ \ | |/ / / / /
| * | | | | api-ref - template version and functionstengqm2016-08-223-31/+137
* | | | | | Merge "api-ref - stack actions"Jenkins2016-08-237-26/+355
|\ \ \ \ \ \ | |/ / / / /
| * | | | | api-ref - stack actionstengqm2016-08-227-26/+355
* | | | | | Merge "api-ref - events"Jenkins2016-08-236-137/+264
|\ \ \ \ \ \ | |/ / / / /
| * | | | | api-ref - eventstengqm2016-08-226-137/+264
* | | | | | Merge "api-ref - stack snapshots"Jenkins2016-08-235-77/+175
|\ \ \ \ \ \ | |/ / / / /
| * | | | | api-ref - stack snapshotstengqm2016-08-225-77/+175
* | | | | | Merge "api-ref - stack resources"Jenkins2016-08-235-67/+238
|\ \ \ \ \ \ | |/ / / / /
| * | | | | api-ref - stack resourcestengqm2016-08-225-67/+238
* | | | | | Merge "api-ref - services/stack-outputs doc"Jenkins2016-08-239-145/+135
|\ \ \ \ \ \ | |/ / / / /
| * | | | | api-ref - services/stack-outputs doctengqm2016-08-229-145/+135
* | | | | | Merge "api-ref - stack identity usage in find calls"Jenkins2016-08-232-5/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | api-ref - stack identity usage in find callstengqm2016-08-222-5/+11
* | | | | | Merge "Use tempest.conf when running under tempest"Jenkins2016-08-232-5/+11
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Use tempest.conf when running under tempestSteve Baker2016-08-132-5/+11
* | | | | Merge "Add valid merge strategies"Jenkins2016-08-222-0/+79
|\ \ \ \ \
| * | | | | Add valid merge strategiesrabi2016-08-222-0/+79
| | |_|/ / | |/| | |
* | | | | Merge "Add OS::Heat::Value resource"Jenkins2016-08-224-2/+375
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add OS::Heat::Value resourceCrag Wolfe2016-08-204-2/+375
* | | | | Merge "api-ref - build/resource-type/versions"Jenkins2016-08-2215-270/+378
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | api-ref - build/resource-type/versionstengqm2016-08-2215-270/+378
| |/ / /
* | | | Merge "Updated from global requirements"Jenkins2016-08-222-4/+4
|\ \ \ \
| * | | | Updated from global requirementsOpenStack Proposal Bot2016-08-222-4/+4
* | | | | Merge "Don't manipulate config for admin creds"Jenkins2016-08-222-19/+28
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Don't manipulate config for admin credsSteve Baker2016-08-132-19/+28
* | | | | Merge "Register heat tempest plugin"Jenkins2016-08-223-0/+51
|\ \ \ \ \ | |/ / / /
| * | | | Register heat tempest pluginSteve Baker2016-08-133-0/+51
* | | | | Merge "Depend on tempest in test-requirements.txt"Jenkins2016-08-223-35/+7
|\ \ \ \ \ | |/ / / /
| * | | | Depend on tempest in test-requirements.txtSteve Baker2016-08-133-35/+7
* | | | | Merge "Override client() for RoleAssignment resources"Jenkins2016-08-229-21/+54
|\ \ \ \ \
| * | | | | Override client() for RoleAssignment resourcesrabi2016-08-189-21/+54
* | | | | | Merge "Remove tenant_safe flag from rpc and db api"Jenkins2016-08-2221-221/+110
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Remove tenant_safe flag from rpc and db apirabi2016-08-1621-221/+110
* | | | | | Merge "Add new environment section for merge strategies"Jenkins2016-08-212-3/+20
|\ \ \ \ \ \
| * | | | | | Add new environment section for merge strategiesrabi2016-08-192-3/+20