summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updated from global requirementskilo-eol2015.1.4stable/kiloOpenStack Proposal Bot2016-04-291-3/+3
* Merge "Ignore TypeErrors on old properties during update" into stable/kiloJenkins2016-03-101-1/+1
|\
| * Ignore TypeErrors on old properties during updateZane Bitter2016-03-021-1/+1
* | Merge "Fix database purge query" into stable/kiloJenkins2016-03-105-39/+124
|\ \
| * | Fix database purge queryThomas Herve2016-03-035-39/+124
* | | Merge "Ignore errors on old properties during update" into stable/kiloJenkins2016-03-072-3/+108
|\ \ \ | | |/ | |/|
| * | Ignore errors on old properties during updateThomas Herve2016-02-112-3/+108
| |/
* | Updated from global requirementsOpenStack Proposal Bot2016-02-111-1/+1
* | Merge "Release lock correctly when resetting stacks at startup" into stable/kiloJenkins2016-02-101-1/+1
|\ \ | |/ |/|
| * Release lock correctly when resetting stacks at startupZane Bitter2016-01-271-1/+1
* | Merge "Prevent phantom user hooks" into stable/kiloJenkins2016-02-101-8/+12
|\ \
| * | Prevent phantom user hooksZane Bitter2016-01-281-8/+12
| |/
* | Merge "Ignore ValueError when adding dependencies" into stable/kiloJenkins2016-02-022-1/+20
|\ \
| * | Ignore ValueError when adding dependenciesRabi Mishra2016-01-262-1/+20
* | | Merge "Don't calculate attributes for metadata request" into stable/kiloJenkins2016-01-286-8/+20
|\ \ \ | |_|/ |/| |
| * | Don't calculate attributes for metadata requestZane Bitter2016-01-266-8/+20
* | | Merge "Neutron port, tolerate switching network name/id" into stable/kiloJenkins2016-01-263-5/+130
|\ \ \
| * | | Neutron port, tolerate switching network name/idSteven Hardy2015-12-173-5/+130
* | | | Merge "Make minimum default num_engine_workers>=4" into stable/kiloJenkins2016-01-263-4/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Make minimum default num_engine_workers>=4Steve Baker2016-01-213-4/+6
| | |/ | |/|
* | | Bump stable/kilo next version to 2015.1.4Dave Walker (Daviey)2016-01-221-1/+1
|/ /
* | Merge "Load template files only from their known source" into stable/kilo2015.1.3Jenkins2016-01-197-31/+51
|\ \
| * | Load template files only from their known sourceZane Bitter2016-01-187-31/+51
* | | Do not return None when get_attr if res is in SNAPSHOT/CHECKhuangtianhua2016-01-183-3/+80
|/ /
* | Merge "Eliminate unnecessary sleeps during no-op update" into stable/kiloJenkins2016-01-122-4/+7
|\ \
| * | Eliminate unnecessary sleeps during no-op updateZane Bitter2016-01-112-4/+7
* | | Should execute 'resolve' before check the values of 'for_each'lvdongbing2015-12-212-8/+15
|/ /
* | Fix property comparison in neutron resourcesThomas Herve2015-12-171-8/+3
|/
* Merge "reset_stack_status thread_lock needs stack_id" into stable/kiloJenkins2015-12-071-1/+1
|\
| * reset_stack_status thread_lock needs stack_idSteve Baker2015-12-041-1/+1
* | Merge "Correct reset_state_on_error() handling" into stable/kiloJenkins2015-12-042-16/+16
|\ \
| * | Correct reset_state_on_error() handlinghuangtianhua2015-12-042-16/+16
| |/
* | Updated from global requirementsOpenStack Proposal Bot2015-12-021-1/+1
|/
* Merge "Reset stack status even when lock engine_id is None" into stable/kiloJenkins2015-11-243-30/+80
|\
| * Reset stack status even when lock engine_id is NoneSteve Baker2015-11-183-30/+80
* | Merge "Copy the env to the backup stack in failed update" into stable/kiloJenkins2015-11-242-0/+34
|\ \
| * | Copy the env to the backup stack in failed updateThomas Herve2015-11-192-0/+34
* | | Merge "Revert "Fix wrong type of exception raised"" into stable/kiloJenkins2015-11-2411-51/+37
|\ \ \
| * | | Revert "Fix wrong type of exception raised"Zane Bitter2015-11-2011-51/+37
* | | | Merge "Allow in-place updates for all compatible types" into stable/kiloJenkins2015-11-234-2/+119
|\ \ \ \ | |/ / / |/| | |
| * | | Allow in-place updates for all compatible typesSteven Hardy2015-11-174-2/+119
| | |/ | |/|
* | | Merge "Ensure that stacks can't get stuck IN_PROGRESS" into stable/kiloJenkins2015-11-192-0/+87
|\ \ \ | |_|/ |/| |
| * | Ensure that stacks can't get stuck IN_PROGRESSZane Bitter2015-11-182-0/+87
| |/
* | Backport TestResource to stable/kiloSteve Baker2015-11-191-36/+137
|/
* Merge "Fix wrong type of exception raised" into stable/kiloJenkins2015-11-1711-37/+51
|\
| * Fix wrong type of exception raisedSteve Baker2015-11-1011-37/+51
* | Merge "Log an error on an uncaught exception in a thread" into stable/kiloJenkins2015-11-171-3/+14
|\ \
| * | Log an error on an uncaught exception in a threadZane Bitter2015-11-111-3/+14
| |/
* | Merge "Resource.has_interface check get_resource_info result" into stable/kiloJenkins2015-11-162-1/+7
|\ \
| * | Resource.has_interface check get_resource_info resultSteve Baker2015-11-062-1/+7
| |/
View Lorry Controller Status