Merge branch 'stable-2.6'

[ganeti-local] / .gitignore

diff --git a/.gitignore b/.gitignore
index 86e80c2..13ce302 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,6 @@
 /autotools/missing
 /autotools/py-compile
 /autotools/replace_vars.sed
-/autotools/testrunner
 /config.log
 /config.status
 /configure
@@ -102,11 +101,14 @@
 /htools/coverage
 
 /htools/htools
+/htools/hconfd
+/htools/hpc-htools
 /htools/test
 /htools/*.prof*
 /htools/*.stat
 /htools/*.tix
 /.hpc/
+/*.tix
 
 /htools/Ganeti/HTools/Version.hs
 /htools/Ganeti/Constants.hs