Big Switch Neutron ML2 plugin integration

[apex-tripleo-heat-templates.git] / README.md

diff --git a/README.md b/README.md
index 2013552..97cc384 100644 (file)
--- 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'.