openstack/heat
Code Issues Proposed changes

Fix indentation in docs

Browse Source 
Change-Id: If7044bb0d349eea1633474583e6f4c78afc93667
This commit is contained in:
David Rabel 2019-02-15 11:37:11 +01:00
parent f47748d4b6
commit dd4337cca2
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
doc/source/template_guide/environment.rst
View File

@ -71,18 +71,18 @@ strategies in an environment file.
There are three merge strategy types:
``overwrite``
Overwrites a parameter, existing parameter values are replaced.
``overwrite``
Overwrites a parameter, existing parameter values are replaced.
``merge``
Merges the existing parameter value and the new value. String values
are concatenated, comma delimited lists are extended and json values
are updated.
``merge``
Merges the existing parameter value and the new value. String values
are concatenated, comma delimited lists are extended and json values
are updated.
``deep_merge``
Json values are deep merged. Not useful for other types like comma
delimited lists and strings. If specified for them, it falls back to
``merge``.
``deep_merge``
Json values are deep merged. Not useful for other types like comma
delimited lists and strings. If specified for them, it falls back to
``merge``.
You can provide a default merge strategy and/or parameter specific merge strategies
per environment file. Parameter specific merge strategy is only used for that