Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Support condition for resource" | Jenkins | 2016-08-25 | 11 | -20/+395 |
|\ | |||||
| * | Support condition for resource | huangtianhua | 2016-08-24 | 11 | -20/+395 |
* | | Merge "A context cache for Resource objects" | Jenkins | 2016-08-24 | 2 | -2/+29 |
|\ \ | |||||
| * | | A context cache for Resource objects | Steve Baker | 2016-08-16 | 2 | -2/+29 |
* | | | Merge "Run heat_integrationtests as a tempest plugin" | Jenkins | 2016-08-24 | 10 | -201/+19 |
|\ \ \ | |||||
| * | | | Run heat_integrationtests as a tempest plugin | Steve Baker | 2016-08-13 | 10 | -201/+19 |
* | | | | Merge "Move merge_environment to environment_util module" | Jenkins | 2016-08-24 | 7 | -81/+100 |
|\ \ \ \ | |||||
| * | | | | Move merge_environment to environment_util module | rabi | 2016-08-22 | 7 | -81/+100 |
* | | | | | Merge "Fix devstack plugin" | Jenkins | 2016-08-24 | 2 | -7/+22 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Fix devstack plugin | rabi | 2016-08-08 | 2 | -7/+22 |
* | | | | | Merge "Convergence: fix input to check_stack_complete" | Jenkins | 2016-08-24 | 2 | -1/+21 |
|\ \ \ \ \ | |||||
| * | | | | | Convergence: fix input to check_stack_complete | Anant Patil | 2016-08-23 | 2 | -1/+21 |
* | | | | | | Merge "Do not use env var conf defaults" | Jenkins | 2016-08-24 | 6 | -19/+35 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Do not use env var conf defaults | Steve Baker | 2016-08-13 | 6 | -19/+35 |
* | | | | | | Merge "Include heat_integrationtests in setup.py install" | Jenkins | 2016-08-24 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Include heat_integrationtests in setup.py install | Zane Bitter | 2016-08-23 | 1 | -0/+1 |
* | | | | | | | Merge "Updated from global requirements" | Jenkins | 2016-08-24 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Updated from global requirements | OpenStack Proposal Bot | 2016-08-24 | 2 | -2/+2 |
* | | | | | | | | Merge "Refactor validate_resource_definitions()" | Jenkins | 2016-08-24 | 1 | -53/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Refactor validate_resource_definitions() | huangtianhua | 2016-08-23 | 1 | -53/+9 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge "Load resources from DB for resource list" | Jenkins | 2016-08-24 | 4 | -79/+99 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Load resources from DB for resource list | Steve Baker | 2016-08-15 | 4 | -79/+99 |
* | | | | | | | | | Merge "Use a variable for which conf file to write to" | Jenkins | 2016-08-24 | 1 | -11/+11 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Use a variable for which conf file to write to | Steve Baker | 2016-08-13 | 1 | -11/+11 |
* | | | | | | | | Merge "Migrate stacks from legacy to convergence engine" | Jenkins | 2016-08-23 | 10 | -8/+188 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Migrate stacks from legacy to convergence engine | Oleksii Chuprykov | 2016-08-22 | 10 | -8/+188 |
* | | | | | | | | Merge "Delete RoleAssignment if user/group does not exist" | Jenkins | 2016-08-23 | 4 | -16/+45 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Delete RoleAssignment if user/group does not exist | rabi | 2016-08-23 | 4 | -16/+45 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge "api-ref - software config status codes" | Jenkins | 2016-08-23 | 1 | -18/+118 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | api-ref - software config status codes | tengqm | 2016-08-22 | 1 | -18/+118 |
* | | | | | | | | | Merge "api-ref - template version and functions" | Jenkins | 2016-08-23 | 3 | -31/+137 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | api-ref - template version and functions | tengqm | 2016-08-22 | 3 | -31/+137 |
* | | | | | | | | | Merge "api-ref - stack actions" | Jenkins | 2016-08-23 | 7 | -26/+355 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | api-ref - stack actions | tengqm | 2016-08-22 | 7 | -26/+355 |
* | | | | | | | | | Merge "api-ref - events" | Jenkins | 2016-08-23 | 6 | -137/+264 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | api-ref - events | tengqm | 2016-08-22 | 6 | -137/+264 |
* | | | | | | | | | Merge "api-ref - stack snapshots" | Jenkins | 2016-08-23 | 5 | -77/+175 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | api-ref - stack snapshots | tengqm | 2016-08-22 | 5 | -77/+175 |
* | | | | | | | | | Merge "api-ref - stack resources" | Jenkins | 2016-08-23 | 5 | -67/+238 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | api-ref - stack resources | tengqm | 2016-08-22 | 5 | -67/+238 |
* | | | | | | | | | Merge "api-ref - services/stack-outputs doc" | Jenkins | 2016-08-23 | 9 | -145/+135 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | api-ref - services/stack-outputs doc | tengqm | 2016-08-22 | 9 | -145/+135 |
* | | | | | | | | | Merge "api-ref - stack identity usage in find calls" | Jenkins | 2016-08-23 | 2 | -5/+11 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | api-ref - stack identity usage in find calls | tengqm | 2016-08-22 | 2 | -5/+11 |
* | | | | | | | | | Merge "Use tempest.conf when running under tempest" | Jenkins | 2016-08-23 | 2 | -5/+11 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | / / / / / | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Use tempest.conf when running under tempest | Steve Baker | 2016-08-13 | 2 | -5/+11 |
* | | | | | | | | Merge "Add valid merge strategies" | Jenkins | 2016-08-22 | 2 | -0/+79 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Add valid merge strategies | rabi | 2016-08-22 | 2 | -0/+79 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge "Add OS::Heat::Value resource" | Jenkins | 2016-08-22 | 4 | -2/+375 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Add OS::Heat::Value resource | Crag Wolfe | 2016-08-20 | 4 | -2/+375 |