heat/heat
Rabi Mishra b8d09f347c Fix parameter merging with merge strategies
Earlier users had to specify merge strategy for
a parameter/parameter_default in every environment
file where they are used(or the defaults for that
environment was used). However, the strategy
for a parameter in the first environment was
ignored as there is nothing to merge.

With Iec3367667248d0b46196a6d569f3cbb3b200d842, we
changed to use existing merge strategies, but the
strategies in the first environment were still
ignored. This patch fixes it.

Task: 45578
Change-Id: Ic6125c6af60c1007243523cc8510a17f49c7b5af
(cherry picked from commit d9fe7301b3)
(cherry picked from commit 154691d21d)
2022-07-04 12:32:15 +00:00
..
api [goal] Deprecate the JSON formatted policy file 2021-06-17 01:35:45 +08:00
cloudinit Detect EL8 platform-python 2020-12-15 11:31:40 -07:00
cmd [goal] Deprecate the JSON formatted policy file 2021-06-17 01:35:45 +08:00
common Fix parameter merging with merge strategies 2022-07-04 12:32:15 +00:00
db Fix SQLAlchemy use for version 1.4 2021-06-16 07:55:25 +10:00
engine Fix None comparision when sorting by `updated_at` 2022-04-13 07:55:38 +00:00
hacking Update hacking for Python3 2020-04-16 08:41:49 +02:00
httpd Always reset CONF when starting the wsgi app 2020-11-17 15:26:52 +00:00
locale Imported Translations from Zanata 2020-10-11 06:33:28 +00:00
objects Don't update status for replaced resource 2021-04-01 19:39:58 +05:30
policies Add separate policy for updates with no changes 2021-03-15 17:38:14 +05:30
rpc Option for retrieving child templates and env files from swift 2018-07-26 09:50:51 +05:30
scaling Remove six and python 2.7 full support 2020-04-23 14:49:12 +02:00
tests Fix parameter merging with merge strategies 2022-07-04 12:32:15 +00:00
__init__.py Make import of oslo libraries namespaceless 2015-02-18 22:54:10 +01:00
version.py change the dist name to 'openstack-heat' 2018-11-01 11:54:05 -04:00