Merge branch 'stable-2.9' into stable-2.10

[ganeti-local] / .gitignore

diff --git a/.gitignore b/.gitignore
index 0ab9ff9..7ee213a 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
@@ -60,12 +62,16 @@
 /doc/hs-lint.html
 /doc/manpages-enabled.rst
 /doc/man-*.rst
+/doc/users/groupmemberships
+/doc/users/groups
+/doc/users/users
 
 # doc/examples
 /doc/examples/bash_completion
 /doc/examples/bash_completion-debug
 /doc/examples/ganeti.cron
 /doc/examples/ganeti.initd
+/doc/examples/ganeti.logrotate
 /doc/examples/ganeti-kvm-poweroff.initd
 /doc/examples/ganeti-master-role.ocf
 /doc/examples/ganeti-node-role.ocf
@@ -73,9 +79,10 @@
 /doc/examples/hooks/ipsec
 
 # lib
-/lib/_autoconf.py
+/lib/_constants.py
 /lib/_vcsversion.py
 /lib/_generated_rpc.py
+/lib/opcodes.py
 
 # man
 /man/*.[0-9]
@@ -85,6 +92,7 @@
 
 # test/hs
 /test/hs/hail
+/test/hs/harep
 /test/hs/hbal
 /test/hs/hcheck
 /test/hs/hinfo
@@ -101,6 +109,8 @@
 /tools/ensure-dirs
 /tools/users-setup
 /tools/vcluster-setup
+/tools/vif-ganeti
+/tools/net-common
 /tools/node-cleanup
 /tools/node-daemon-setup
 /tools/prepare-node-join
@@ -121,10 +131,17 @@
 /src/mon-collector
 /src/htools
 /src/hconfd
+/src/hluxid
+/src/hs2py
+/src/hs2py-constants
 /src/ganeti-confd
+/src/ganeti-luxid
+/src/ganeti-mond
 /src/rpc-test
 
 # automatically-built Haskell files
-/src/Ganeti/Constants.hs
+/src/AutoConf.hs
+/src/Ganeti/Curl/Internal.hs
+/src/Ganeti/Hs2Py/ListConstants.hs
 /src/Ganeti/Version.hs
 /test/hs/Test/Ganeti/TestImports.hs