Revert "Network and address pool"

[ganeti-local] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1b82e7c..e9b9404 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@
 *.o
 *.hi
 *.hp
-.dir
 
 # /
 /Makefile
@@ -24,12 +23,14 @@
 /autotools/missing
 /autotools/py-compile
 /autotools/replace_vars.sed
+/autotools/shell-env-init
 /config.log
 /config.status
 /configure
 /epydoc.conf
 /ganeti
 /stamp-srclinks
+/stamp-directories
 /vcs-version
 /*.patch
 /*.tar.bz2
@@ -39,7 +40,6 @@
 # daemons
 /daemons/daemon-util
 /daemons/ganeti-cleaner
-/daemons/ganeti-confd
 /daemons/ganeti-masterd
 /daemons/ganeti-noded
 /daemons/ganeti-rapi
@@ -47,7 +47,6 @@
 
 # devel
 /devel/clean-cluster
-/devel/upload
 
 # doc
 /doc/api/
@@ -63,9 +62,12 @@
 
 # doc/examples
 /doc/examples/bash_completion
+/doc/examples/bash_completion-debug
 /doc/examples/ganeti.cron
 /doc/examples/ganeti.initd
 /doc/examples/ganeti-kvm-poweroff.initd
+/doc/examples/ganeti-master-role.ocf
+/doc/examples/ganeti-node-role.ocf
 /doc/examples/gnt-config-backup
 /doc/examples/hooks/ipsec
 
@@ -81,9 +83,21 @@
 /man/*.gen
 /man/footer.man
 
+# htest
+/htest/hail
+/htest/hbal
+/htest/hcheck
+/htest/hinfo
+/htest/hscan
+/htest/hspace
+
 # tools
 /tools/kvm-ifup
 /tools/ensure-dirs
+/tools/vcluster-setup
+/tools/node-cleanup
+/tools/node-daemon-setup
+/tools/prepare-node-join
 
 # scripts
 /scripts/gnt-backup
@@ -94,6 +108,7 @@
 /scripts/gnt-job
 /scripts/gnt-node
 /scripts/gnt-os
+/scripts/gnt-network
 
 # htools-specific rules
 /htools/apidoc
@@ -101,11 +116,20 @@
 /htools/coverage
 
 /htools/htools
-/htools/test
+/htools/hconfd
+/htools/ganeti-confd
+/htools/rpc-test
+/htest/hpc-htools
+/htest/test
 /htools/*.prof*
 /htools/*.stat
 /htools/*.tix
+/htest/*.prof*
+/htest/*.stat
+/htest/*.tix
 /.hpc/
+/*.tix
 
-/htools/Ganeti/HTools/Version.hs
 /htools/Ganeti/Constants.hs
+/htools/Ganeti/Version.hs
+/htest/Test/Ganeti/TestImports.hs