Merge branch 'stable-2.7' into stable-2.8

[ganeti-local] / .gitignore

diff --git a/.gitignore b/.gitignore
index c4e0cb2..0279908 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,8 @@
 /config.log
 /config.status
 /configure
+/devel/squeeze-amd64.tar.gz
+/devel/squeeze-amd64.conf
 /epydoc.conf
 /ganeti
 /stamp-srclinks
@@ -49,20 +51,17 @@
 /daemons/ganeti-rapi
 /daemons/ganeti-watcher
 
-# devel
-/devel/clean-cluster
-
 # doc
 /doc/api/
-/doc/build
 /doc/coverage/
-/doc/html
+/doc/html/
+/doc/man-html/
 /doc/install-quick.rst
 /doc/news.rst
 /doc/upgrade.rst
 /doc/hs-lint.html
-/doc/*.in
-/doc/*.png
+/doc/manpages-enabled.rst
+/doc/man-*.rst
 
 # doc/examples
 /doc/examples/bash_completion
@@ -88,6 +87,7 @@
 
 # test/hs
 /test/hs/hail
+/test/hs/harep
 /test/hs/hbal
 /test/hs/hcheck
 /test/hs/hinfo
@@ -100,7 +100,9 @@
 
 # tools
 /tools/kvm-ifup
+/tools/burnin
 /tools/ensure-dirs
+/tools/users-setup
 /tools/vcluster-setup
 /tools/node-cleanup
 /tools/node-daemon-setup
@@ -123,9 +125,11 @@
 /src/htools
 /src/hconfd
 /src/ganeti-confd
+/src/ganeti-mond
 /src/rpc-test
 
 # automatically-built Haskell files
 /src/Ganeti/Constants.hs
+/src/Ganeti/Curl/Internal.hs
 /src/Ganeti/Version.hs
 /test/hs/Test/Ganeti/TestImports.hs