Merge remote branch 'google/stable-2.6' into stable-2.6-ippool-hotplug-esi

[ganeti-local] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3885108..fe31650 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -81,6 +81,14 @@
 /man/*.gen
 /man/footer.man
 
+# test
+/test/hail
+/test/hbal
+/test/hcheck
+/test/hinfo
+/test/hscan
+/test/hspace
+
 # tools
 /tools/kvm-ifup
 /tools/ensure-dirs
@@ -94,6 +102,7 @@
 /scripts/gnt-job
 /scripts/gnt-node
 /scripts/gnt-os
+/scripts/gnt-storage
 
 # htools-specific rules
 /htools/apidoc
@@ -102,7 +111,7 @@
 
 /htools/htools
 /htools/hconfd
-/htools/htools-hpc
+/htools/hpc-htools
 /htools/test
 /htools/*.prof*
 /htools/*.stat