diff options
| author | Dan Prince <dprince@redhat.com> | 2015-10-17 22:58:35 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2015-10-21 19:33:18 -0400 |
| commit | 7f8e92ee00e57714ab648a33abf796f68ea57387 (patch) | |
| tree | 31507b8f9f2d378e935b77d844af4c11e5ab3a50 /setup.cfg | |
| parent | 9185cd7e2c83f90eecdb4766b134699dbdfb6438 (diff) | |
| download | heat-7f8e92ee00e57714ab648a33abf796f68ea57387.tar.gz | |
Implement new map_merge intrinsic function
Adds a new map_merge function for Mitaka which can be used
to merge maps. Values in latter maps override those in earlier
ones.
Also, creates a new HOT template version for Mitaka which includes
the new map_merge function.
Implements: blueprint map-merge-function
Change-Id: I2bdfc70d04a4fa14cefcf928ea5947fbe7529cf9
Diffstat (limited to 'setup.cfg')
| -rw-r--r-- | setup.cfg | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -109,6 +109,7 @@ heat.templates = heat_template_version.2014-10-16 = heat.engine.hot.template:HOTemplate20141016 heat_template_version.2015-04-30 = heat.engine.hot.template:HOTemplate20150430 heat_template_version.2015-10-15 = heat.engine.hot.template:HOTemplate20151015 + heat_template_version.2016-04-08 = heat.engine.hot.template:HOTemplate20160408 HeatTemplateFormatVersion.2012-12-12 = heat.engine.cfn.template:HeatTemplate AWSTemplateFormatVersion.2010-09-09 = heat.engine.cfn.template:CfnTemplate |