aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorClint Byrum <clint@fewbar.com>2013-09-18 18:08:08 -0700
committerClint Byrum <clint@fewbar.com>2013-09-19 13:02:03 -0700
commit0dbf2810a0ee78658c35e61dc447c5f968226cb9 (patch)
tree3fbdcde17fd5ceb58b9baf548061306022aa269a /README.md
parentb7f0bb6123f75c87e4da51f6bfa7a92a515a898c (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
Diffstat (limited to 'README.md')
-rw-r--r--README.md8
1 files changed, 7 insertions, 1 deletions
diff --git a/README.md b/README.md
index 2013552..97cc384 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,10 @@
templates
=========
-Generic templates to describe multi-host infrastructure, consumable by OpenStack Heat, Crowbar, others. \ No newline at end of file
+Generic templates to describe multi-host infrastructure, consumable by OpenStack Heat, Crowbar, others.
+
+
+merge.py
+========
+
+The Makefile contains several targets for generated templates, see its contents for all of them. To run functional tests for merge.py, run 'make test'.