summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge "Increase the timeout for the stop_stack message" into stable/newton7.0.0.0rc27.0.0Jenkins2016-09-263-8/+57
|\
| * Increase the timeout for the stop_stack messageZane Bitter2016-09-233-8/+57
* | Get rid of circular reference in Event classZane Bitter2016-09-231-4/+4
|/
* Merge "Don't use cast() to do StackResource delete" into stable/newtonJenkins2016-09-234-5/+7
|\
| * Don't use cast() to do StackResource deleteZane Bitter2016-09-224-5/+7
* | Do not attempt deletion of a DELETE_COMPLETE stack in service apiCrag Wolfe2016-09-222-0/+15
|/
* Merge "Fix cancel update for nova server with defined port" into stable/newtonJenkins2016-09-214-62/+161
|\
| * Fix cancel update for nova server with defined portOleksii Chuprykov2016-09-214-62/+161
* | Merge "Re-trigger on update-replace" into stable/newtonJenkins2016-09-213-24/+43
|\ \ | |/
| * Re-trigger on update-replaceAnant Patil2016-09-213-24/+43
* | Merge "Legacy delete attempt thread cancel before stop" into stable/newtonJenkins2016-09-212-37/+97
|\ \ | |/ |/|
| * Legacy delete attempt thread cancel before stopSteve Baker2016-09-212-37/+97
* | Merge "Updated from global requirements" into stable/newtonJenkins2016-09-211-1/+1
|\ \
| * | Updated from global requirementsOpenStack Proposal Bot2016-09-201-1/+1
* | | Merge "Cancel traversal of nested stack" into stable/newtonJenkins2016-09-202-16/+53
|\ \ \
| * | | Cancel traversal of nested stackAnant Patil2016-09-202-16/+53
* | | | Merge "Don't acquire the lock when cancelling a stack" into stable/newtonJenkins2016-09-203-6/+36
|\ \ \ \ | |_|_|/ |/| | |
| * | | Don't acquire the lock when cancelling a stackZane Bitter2016-09-193-6/+36
* | | | Merge "Use correct schema for SoftwareDeploymentGroup rolling_update" into st...Jenkins2016-09-201-0/+13
|\ \ \ \
| * | | | Use correct schema for SoftwareDeploymentGroup rolling_updateZane Bitter2016-09-191-0/+13
* | | | | Merge "Fix sync point delete" into stable/newtonJenkins2016-09-204-14/+46
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | |
| * | | Fix sync point deleteAnant Patil2016-09-194-14/+46
| |/ /
* | | Merge "Correct the response info of template-version-list" into stable/newtonJenkins2016-09-201-1/+1
|\ \ \
| * | | Correct the response info of template-version-listhuangtianhua2016-09-191-1/+1
| |/ /
* | | Merge "Allow update inplace for allowed_address_pairs" into stable/newtonJenkins2016-09-202-2/+12
|\ \ \ | |/ / |/| |
| * | Allow update inplace for allowed_address_pairsSergey Kraynev2016-09-192-2/+12
* | | Update UPPER_CONSTRAINTS_FILE for stable/newtonDavanum Srinivas2016-09-191-1/+1
| |/ |/|
* | Don't log locked resource at ERROR levelZane Bitter2016-09-161-8/+9
|/
* Update .gitreview for stable/newtonDavanum Srinivas2016-09-151-0/+1
* Merge "Make get_attr consistent across template versions"7.0.0.0rc1stable/newtonJenkins2016-09-151-12/+17
|\
| * Make get_attr consistent across template versionsZane Bitter2016-09-141-12/+17
* | Merge "Skip resource counting during validation"Jenkins2016-09-152-0/+10
|\ \
| * | Skip resource counting during validationThomas Herve2016-09-142-0/+10
* | | Merge "Avoid circular references in Macro class"Jenkins2016-09-151-1/+11
|\ \ \
| * | | Avoid circular references in Macro classZane Bitter2016-09-141-1/+11
* | | | Merge "Allows condition name using boolean or function"Jenkins2016-09-159-25/+102
|\ \ \ \
| * | | | Allows condition name using boolean or functionhuangtianhua2016-09-129-25/+102
* | | | | Merge "Allow hyphens in OS::Trove::Instance database names"Jenkins2016-09-152-3/+16
|\ \ \ \ \
| * | | | | Allow hyphens in OS::Trove::Instance database namesJason Dunsmore2016-09-062-3/+16
* | | | | | Merge "Add releasenotes for OS::Cinder::QoSSpecs"Jenkins2016-09-151-0/+6
|\ \ \ \ \ \
| * | | | | | Add releasenotes for OS::Cinder::QoSSpecsricolin2016-09-091-0/+6
* | | | | | | Merge "Check policy of resource type again"Jenkins2016-09-151-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Check policy of resource type againhuangtianhua2016-08-031-0/+1
* | | | | | | | Merge "Refactor resource definition parsing in HOT/cfn"Jenkins2016-09-154-139/+146
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Refactor resource definition parsing in HOT/cfnZane Bitter2016-09-124-139/+146
* | | | | | | | Merge "Do str_replace in a single pass"Jenkins2016-09-153-71/+78
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Do str_replace in a single passZane Bitter2016-09-143-71/+78
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge "Move NoActionRequired exception back where it belongs"Jenkins2016-09-149-27/+39
|\ \ \ \ \ \ \
| * | | | | | | Move NoActionRequired exception back where it belongsZane Bitter2016-08-189-27/+39
* | | | | | | | Merge "Create ResourceDefinitions directly in ResourceGroup/Chain"Jenkins2016-09-142-19/+13
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |