From: braam <braam>
Date: Sun, 23 Jun 2002 04:32:15 +0000 (+0000)
Subject: automatic detection of OST/MDS
X-Git-Tag: v1_7_100~5459
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=8e68c6f94ba3cf09682923bfe8f71dc85658c4b9;p=fs%2Flustre-release.git

automatic detection of OST/MDS
#
---

diff --git a/lustre/tests/intent-test.sh b/lustre/tests/intent-test.sh
index ed66a30..266da79 100755
--- a/lustre/tests/intent-test.sh
+++ b/lustre/tests/intent-test.sh
@@ -114,6 +114,9 @@ ls /mnt/lustre
 umount /mnt/lustre
 mount -t lustre_lite -o ost=$OST,mds=$MDS none /mnt/lustre
 
+<<<<<<< intent-test.sh
+cat /mnt/lustre/iotest
+=======
 echo "Testing truncation..."
 echo foo > /mnt/lustre/iotest
 echo bar >> /mnt/lustre/iotest
@@ -122,3 +125,4 @@ echo "trucating to 3 bytes now..."
 ./truncate /mnt/lustre/iotest 4
 cat  /mnt/lustre/iotest
 
+>>>>>>> 1.5