Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 8a99e7d 3e35d53)
Merge "Make removing nodes from scaled items possible."
authorJenkins <jenkins@review.openstack.org>
Wed, 13 Aug 2014 20:05:17 +0000 (20:05 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 13 Aug 2014 20:05:17 +0000 (20:05 +0000)
1  2 
tripleo_heat_merge/merge.py patch | diff1 | diff2 | blob | history

diff --cc tripleo_heat_merge/merge.py
Simple merge