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
+3 -2
View File
@@ -1,5 +1,5 @@
#! /bin/sh
# XFS QA Test No. 082
# FS QA Test No. 082
#
# Test out the v2 stripe logs with logprint
#
@@ -36,7 +36,7 @@
#-----------------------------------------------------------------------
#
# creator
owner=root@icy.melbourne.sgi.com
owner=tes@melbourne.sgi.com
seq=`basename $0`
echo "QA output created by $seq"
@@ -52,6 +52,7 @@ status=1 # failure is the default!
_cleanup()
{
cd /
_cleanup_logfiles
rm -f $tmp.*
echo "*** unmount"