Code Review / apex-tripleo-heat-templates.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(parent: 94eb778) | patch
Fixed merge code populating properties from yaml.
authordivakar-padiyar-nandavar <divakar.padiyar-nandavar@hp.com>
Thu, 8 Aug 2013 13:57:43 +0000 (07:57 -0600)
committerdivakar-padiyar-nandavar <divakar.padiyar-nandavar@hp.com>
Thu, 8 Aug 2013 14:09:13 +0000 (08:09 -0600)
commit61a0528543c6d2f911dd301a11d8ef4d4aa7af59
tree8a84b80f131451984d3a743e4f3c3ff173e3e50ctree | snapshot
parent94eb778d718877da2abfe2af22d6bccf01c45668commit | diff
Fixed merge code populating properties from yaml.

Fixed merge code populating properties from yaml files which was
setting only Type attribute for certain attribues related to Image
For example, default value for notcomputeImage is populated properly
in overcloud.yaml

Fixes bug #1202884

Change-Id: I9ea270dd19e9ebdb997be5d07b04ee2df28e3721
merge.py diff | blob | history