ignore generated files

diff --git a/lustre/.cvsignore b/lustre/.cvsignore
index a8a5356..393bc47 100644 (file)
--- a/lustre/.cvsignore
+++ b/lustre/.cvsignore
@@ -16,3 +16,4 @@ cscope.out
 autom4te-2.53.cache
 autom4te.cache
 .*.o.cmd
+.mergeinfo

diff --git a/lustre/tests/.cvsignore b/lustre/tests/.cvsignore
index 1804318..7054181 100644 (file)
--- a/lustre/tests/.cvsignore
+++ b/lustre/tests/.cvsignore
@@ -55,3 +55,5 @@ ll_sparseness_verify
 ll_sparseness_write
 mrename
 cmknod
+iopentest1
+iopentest2