Code Review / apex-tripleo-heat-templates.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(parent: b7f0bb6) | patch
Add functional tests and examples for merge
authorClint Byrum <clint@fewbar.com>
Thu, 19 Sep 2013 01:08:08 +0000 (18:08 -0700)
committerClint Byrum <clint@fewbar.com>
Thu, 19 Sep 2013 20:02:03 +0000 (13:02 -0700)
commit0dbf2810a0ee78658c35e61dc447c5f968226cb9
tree3fbdcde17fd5ceb58b9baf548061306022aa269atree | snapshot
parentb7f0bb6123f75c87e4da51f6bfa7a92a515a898ccommit | diff
Add functional tests and examples for merge

merge.py is undocumented and untested, which is undesirable, as it does
not seem to be going away any time soon.

Change-Id: I7e4870e58a32c567e5947b9a48893b8210ad4d65
.gitignore diff | blob | history
Makefile diff | blob | history
README.md diff | blob | history
examples/lib.yaml [new file with mode: 0644] blob
examples/source.yaml [new file with mode: 0644] blob
examples/source_lib_result.yaml [new file with mode: 0644] blob
test_merge.bash [new file with mode: 0644] blob