summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge "Support condition for resource"Jenkins2016-08-2511-20/+395
|\
| * Support condition for resourcehuangtianhua2016-08-2411-20/+395
* | Merge "A context cache for Resource objects"Jenkins2016-08-242-2/+29
|\ \
| * | A context cache for Resource objectsSteve Baker2016-08-162-2/+29
* | | Merge "Run heat_integrationtests as a tempest plugin"Jenkins2016-08-2410-201/+19
|\ \ \
| * | | Run heat_integrationtests as a tempest pluginSteve Baker2016-08-1310-201/+19
* | | | Merge "Move merge_environment to environment_util module"Jenkins2016-08-247-81/+100
|\ \ \ \
| * | | | Move merge_environment to environment_util modulerabi2016-08-227-81/+100
* | | | | Merge "Fix devstack plugin"Jenkins2016-08-242-7/+22
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix devstack pluginrabi2016-08-082-7/+22
* | | | | Merge "Convergence: fix input to check_stack_complete"Jenkins2016-08-242-1/+21
|\ \ \ \ \
| * | | | | Convergence: fix input to check_stack_completeAnant Patil2016-08-232-1/+21
* | | | | | Merge "Do not use env var conf defaults"Jenkins2016-08-246-19/+35
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Do not use env var conf defaultsSteve Baker2016-08-136-19/+35
* | | | | | Merge "Include heat_integrationtests in setup.py install"Jenkins2016-08-241-0/+1
|\ \ \ \ \ \
| * | | | | | Include heat_integrationtests in setup.py installZane Bitter2016-08-231-0/+1
* | | | | | | 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