Fixed merge problems

This commit is contained in:
ptools
2004-06-15 07:32:36 +00:00
parent 2c3b0bab9f
commit cb6beb9759
144 changed files with 2372 additions and 2383 deletions
+4 -1
View File
@@ -1,5 +1,5 @@
#! /bin/sh
# XFS QA Test No. 086
# FS QA Test No. 086
#
# To test log replay with version 2 logs
# Initially keep this simple with just creates.
@@ -54,6 +54,9 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
. ./common.log
# real QA test starts here
_supported_fs xfs
_supported_os IRIX Linux
rm -f $seq.full $tmp.*
_require_scratch