Merge branch 'devel-2.4' into stable-2.4

[ganeti-local] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9dea792..ebb7325 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@
 /config.log
 /config.status
 /configure
+/epydoc.conf
 /ganeti
 /stamp-srclinks
 /vcs-version
@@ -36,7 +37,10 @@
 /daemons/daemon-util
 /daemons/ensure-dirs
 /daemons/ganeti-cleaner
+/daemons/ganeti-confd
 /daemons/ganeti-masterd
+/daemons/ganeti-noded
+/daemons/ganeti-rapi
 /daemons/ganeti-watcher
 
 # devel
@@ -50,6 +54,7 @@
 /doc/html
 /doc/install-quick.rst
 /doc/news.rst
+/doc/upgrade.rst
 /doc/*.in
 /doc/*.png
 
@@ -57,6 +62,7 @@
 /doc/examples/bash_completion
 /doc/examples/ganeti.cron
 /doc/examples/ganeti.initd
+/doc/examples/ganeti-kvm-poweroff.initd
 /doc/examples/gnt-config-backup
 /doc/examples/hooks/ipsec
 
@@ -67,11 +73,16 @@
 /man/*.[0-9]
 /man/*.html
 /man/*.in
+/man/footer.man
+
+# tools
+/tools/kvm-ifup
 
 # scripts
 /scripts/gnt-backup
 /scripts/gnt-cluster
 /scripts/gnt-debug
+/scripts/gnt-group
 /scripts/gnt-instance
 /scripts/gnt-job
 /scripts/gnt-node