Merge branch 'stable-2.6'

[ganeti-local] / .gitignore

diff --git a/.gitignore b/.gitignore
index e76d81d..13ce302 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -38,7 +38,6 @@
 
 # daemons
 /daemons/daemon-util
-/daemons/ensure-dirs
 /daemons/ganeti-cleaner
 /daemons/ganeti-confd
 /daemons/ganeti-masterd
@@ -51,13 +50,14 @@
 /devel/upload
 
 # doc
-/doc/api
+/doc/api/
 /doc/build
-/doc/coverage
+/doc/coverage/
 /doc/html
 /doc/install-quick.rst
 /doc/news.rst
 /doc/upgrade.rst
+/doc/hs-lint.html
 /doc/*.in
 /doc/*.png
 
@@ -71,6 +71,8 @@
 
 # lib
 /lib/_autoconf.py
+/lib/_vcsversion.py
+/lib/_generated_rpc.py
 
 # man
 /man/*.[0-9]
@@ -81,6 +83,7 @@
 
 # tools
 /tools/kvm-ifup
+/tools/ensure-dirs
 
 # scripts
 /scripts/gnt-backup
@@ -97,13 +100,15 @@
 /htools/.hpc
 /htools/coverage
 
-/htools/hbal
-/htools/hscan
-/htools/hail
-/htools/hspace
+/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