aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authormarios <marios@redhat.com>2013-11-29 15:12:33 +0200
committermarios <marios@redhat.com>2013-12-17 15:53:08 +0200
commitc9ce27c981d74c18f844fa71339c0177c3f76b28 (patch)
tree79816c9ffb800bcf3fc47ddc7197cff285ddc761 /.gitignore
parentf6289d012740c730ac1b9b0ea8a3842f8c72149e (diff)
Make merge.py installable as a package using pbr
Now that merge.py is invokable from another script (Ia6b6416fe10358d23f2b120283eecaf4c1178cfd) and from comments at that review, it makes sense to offer a nicer way to consume the merge functionality. Once you git clone tripleo-heat-templates you can python setup.py install and get /usr/bin/tripleo_heat_merge as well as a tripleo_heat_merge package in python2.7/site-packages. Makefile edits required because we moved merge.py into the tripleo_heat_merge directory for the packaging. Change-Id: I587fa7a826f93f89e8e5c266af7f5765438fe738
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 0801599..90c6090 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,7 @@ nosetests.xml
*.swp
doc/_build
+
+# Built by pbr (python setup.py sdist):
+AUTHORS
+ChangeLog