summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Create ResourceDefinitions directly in ResourceGroup/ChainZane Bitter2016-09-122-19/+13
* | | | | | | | Merge "Allow referencing conditions by name"Jenkins2016-09-145-32/+306
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | / / / / / | |_|/ / / / / |/| | | | | |
| * | | | | | Allow referencing conditions by nameZane Bitter2016-09-125-32/+306
* | | | | | | Merge "Add releasenote for conditions function"Jenkins2016-09-141-0/+17
|\ \ \ \ \ \ \
| * | | | | | | Add releasenote for conditions functionhuangtianhua2016-09-141-0/+17
* | | | | | | | Merge "Refactor boolean condition functions"Jenkins2016-09-143-106/+63
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Refactor boolean condition functionsZane Bitter2016-09-123-106/+63
* | | | | | | | Merge "Update plugin-guide documentation page"Jenkins2016-09-141-13/+93
|\ \ \ \ \ \ \ \
| * | | | | | | | Update plugin-guide documentation pagePeter Razumovsky2016-09-091-13/+93
* | | | | | | | | Merge "Make cfn functions inherit from HOT"Jenkins2016-09-149-252/+329
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Make cfn functions inherit from HOTZane Bitter2016-09-129-252/+329
* | | | | | | | | Merge "Always use context manager for DB transactions"Jenkins2016-09-141-9/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Always use context manager for DB transactionsZane Bitter2016-09-131-9/+8
* | | | | | | | | | Merge "Migrate to keystoneauth"Jenkins2016-09-147-7/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Migrate to keystoneauthLu lei2016-09-067-7/+7
* | | | | | | | | | | Merge "Use keystone session in endpoint_utils"Jenkins2016-09-143-8/+7
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | / / / / / / | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Use keystone session in endpoint_utilsrabi2016-09-063-8/+7
* | | | | | | | | | Merge "Ensure cached conditions match stack"Jenkins2016-09-133-17/+30
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Ensure cached conditions match stackZane Bitter2016-09-123-17/+30
* | | | | | | | | | Merge "[api-ref] Remove temporary block in conf.py"Jenkins2016-09-131-27/+9
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | [api-ref] Remove temporary block in conf.pyNguyen Phuong An2016-09-071-27/+9
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge "Copy correct definition to the backup stack"Jenkins2016-09-132-8/+90
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Copy correct definition to the backup stackZane Bitter2016-09-122-8/+90
* | | | | | | | | Merge "Create a public Conditions class API"Jenkins2016-09-139-86/+134
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Create a public Conditions class APIZane Bitter2016-09-129-86/+134
* | | | | | | | | Merge "Raise StackValidationFailed instead of InvalidCondition*"Jenkins2016-09-138-60/+42
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Raise StackValidationFailed instead of InvalidCondition*Zane Bitter2016-09-128-60/+42
* | | | | | | | | Merge "Revert "Improve validation for some functions""Jenkins2016-09-134-15/+16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Revert "Improve validation for some functions"Zane Bitter2016-09-124-15/+16