automatic detection of OST/MDS

\18\18#

diff --git a/lustre/tests/intent-test.sh b/lustre/tests/intent-test.sh
index ed66a30..266da79 100755 (executable)
--- 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