summaryrefslogtreecommitdiff
path: root/heat/engine
Commit message (Expand)AuthorAgeFilesLines
* Merge "Handling concurrent transactions in metadata_set method" into stable/l...5.0.3Jenkins2016-10-142-9/+24
|\
| * Handling concurrent transactions in metadata_set methodSergey Kraynev2016-09-082-9/+24
* | Merge "Allow update inplace for allowed_address_pairs" into stable/libertyJenkins2016-10-141-1/+2
|\ \
| * | Allow update inplace for allowed_address_pairsSergey Kraynev2016-10-031-1/+2
* | | Merge "Make ConcurrentTransaction exception common" into stable/libertyJenkins2016-10-131-1/+2
|\ \ \ | | |/ | |/|
| * | Make ConcurrentTransaction exception commonSergey Kraynev2016-09-081-1/+2
* | | Increase the timeout for the stop_stack messageZane Bitter2016-09-221-4/+9
* | | Don't use cast() to do StackResource deleteZane Bitter2016-09-221-2/+3
| |/ |/|
* | Merge "Fix prepare_for_replace/restore_prev_rsrc handing for server" into sta...Jenkins2016-09-213-29/+91
|\ \ | |/ |/|
| * Fix prepare_for_replace/restore_prev_rsrc handing for serverhuangtianhua2016-09-213-29/+91
* | Merge "Make sure create ceilometer alarm successful" into stable/liberty5.0.2Jenkins2016-08-312-1/+6
|\ \ | |/ |/|
| * Make sure create ceilometer alarm successfulhuangtianhua2016-06-092-1/+6
* | Perform str_replace trying to match longest string firstGiulio Fidente2016-08-162-7/+31
* | Alias UpdateReplace in its rightful locationZane Bitter2016-08-082-9/+13
* | Correct parameter when raise NotSupported exceptionhuangtianhua2016-07-071-2/+2
* | Merge "Delete previous template upon update" into stable/libertyJenkins2016-07-041-0/+5
|\ \
| * | Delete previous template upon updateThomas Herve2016-06-231-0/+5
* | | Catch exceptions calculating implicit dependenciesZane Bitter2016-06-232-5/+34
|/ /
* | Support string index for list in get_paramricolin2016-06-091-0/+9
|/
* Revert "Make sure create ceilometer alarm successful"Oleksii Chuprykov2016-06-082-9/+2
* Make sure create ceilometer alarm successfulhuangtianhua2016-06-072-2/+9
* Merge "Set security_groups when create internal ports for nova server" into s...Jenkins2016-05-312-8/+19
|\
| * Set security_groups when create internal ports for nova serverhuangtianhua2016-05-182-8/+19
* | Merge "Create watch tasks in its own thread" into stable/libertyJenkins2016-05-261-10/+24
|\ \ | |/ |/|
| * Create watch tasks in its own threadSteve Baker2016-04-071-10/+24
* | Stop engine service correctlyOleksii Chuprykov2016-05-171-14/+17
* | Fix Translate properties before updateThomas Herve2016-04-158-69/+42
* | Merge "Remove unknown parameters in patched update" into stable/libertyJenkins2016-04-121-6/+8
|\ \ | |/ |/|
| * Remove unknown parameters in patched updateThomas Herve2016-04-061-6/+8
* | Merge "Reset stack status after resources" into stable/libertyJenkins2016-04-071-2/+2
|\ \ | |/ |/|
| * Reset stack status after resourcesThomas Herve2016-03-301-2/+2
* | Merge "Enable Ceilometer client to work with Keystone API v3" into stable/lib...Jenkins2016-04-051-1/+1
|\ \
| * | Enable Ceilometer client to work with Keystone API v3John Belamaric2016-03-041-1/+1
* | | Merge "Fix update issues with autoscaling group" into stable/libertyJenkins2016-04-052-22/+33
|\ \ \
| * | | Fix update issues with autoscaling groupRabi Mishra2016-03-292-22/+33
* | | | Merge "Avoid cooldown when group size does not change" into stable/libertyJenkins2016-04-052-12/+16
|\ \ \ \ | |/ / /
| * | | Avoid cooldown when group size does not changeOmar Soriano2016-03-292-12/+16
| | |/ | |/|
* | | Merge "Remove defaults for handle_update parameters" into stable/libertyJenkins2016-04-054-7/+4
|\ \ \
| * | | Remove defaults for handle_update parametersRabi Mishra2016-03-204-7/+4
* | | | Merge "Pass all options when doing keystone discovery" into stable/libertyJenkins2016-04-051-16/+3
|\ \ \ \
| * | | | Pass all options when doing keystone discoveryThomas Herve2016-03-171-16/+3
* | | | | Merge "Resolve arguments to 'repeat' function at runtime" into stable/libertyJenkins2016-04-051-10/+17
|\ \ \ \ \
| * | | | | Resolve arguments to 'repeat' function at runtimeZane Bitter2016-03-101-10/+17
| | |/ / / | |/| | |
* | | | | Merge "Always do cleanup after a failed stack update" into stable/libertyJenkins2016-04-051-23/+32
|\ \ \ \ \
| * | | | | Always do cleanup after a failed stack updateZane Bitter2016-02-101-23/+32
* | | | | | Merge "Do not try to save event resource if too big for db column" into stabl...Jenkins2016-04-051-11/+33
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Do not try to save event resource if too big for db columnCrag Wolfe2016-03-091-11/+33
| | |/ / / | |/| | |
* | | | | Merge "Attempt to delete internal resources if create server fail" into stabl...Jenkins2016-03-221-5/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Attempt to delete internal resources if create server failhuangtianhua2016-01-211-5/+4
* | | | | Merge "Build list of enabled os-collect-config collectors" into stable/libertyJenkins2016-03-091-7/+23
|\ \ \ \ \