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
+9 -9
View File
@@ -116,7 +116,7 @@ xfsdump: dump size (non-dir files) : NUM bytes
xfsdump: dump complete: SECS seconds elapsed
xfsdump: Dump Status: SUCCESS
file system 0:
fs id: ID
fs ID: ID
session 0:
mount point: HOSTNAME:SCRATCH_MNT
device: HOSTNAME:SCRATCH_DEV
@@ -140,7 +140,7 @@ file system 0:
mfile start: ino INO offset 0
mfile end: ino INO offset 0
media label: "stress_tape_media"
media id: ID
media ID: ID
session 1:
mount point: HOSTNAME:SCRATCH_MNT
device: HOSTNAME:SCRATCH_DEV
@@ -164,7 +164,7 @@ file system 0:
mfile start: ino INO offset 0
mfile end: ino INO offset 0
media label: "stress_tape_media"
media id: ID
media ID: ID
session 2:
mount point: HOSTNAME:SCRATCH_MNT
device: HOSTNAME:SCRATCH_DEV
@@ -188,7 +188,7 @@ file system 0:
mfile start: ino INO offset 0
mfile end: ino INO offset 0
media label: "stress_tape_media"
media id: ID
media ID: ID
session 3:
mount point: HOSTNAME:SCRATCH_MNT
device: HOSTNAME:SCRATCH_DEV
@@ -212,7 +212,7 @@ file system 0:
mfile start: ino INO offset 0
mfile end: ino INO offset 0
media label: "stress_tape_media"
media id: ID
media ID: ID
session 4:
mount point: HOSTNAME:SCRATCH_MNT
device: HOSTNAME:SCRATCH_DEV
@@ -236,7 +236,7 @@ file system 0:
mfile start: ino INO offset 0
mfile end: ino INO offset 0
media label: "stress_tape_media"
media id: ID
media ID: ID
xfsdump: Dump Status: SUCCESS
Processing file /var/xfsdump/inventory/UUIDstab
Found entry for HOSTNAME:SCRATCH_MNT
@@ -279,7 +279,7 @@ TIME OF DUMP : TIME
Session 3: HOSTNAME:SCRATCH_MNT
Session 4: HOSTNAME:SCRATCH_MNT
file system 0:
fs id: ID
fs ID: ID
session 0:
mount point: HOSTNAME:SCRATCH_MNT
device: HOSTNAME:SCRATCH_DEV
@@ -303,7 +303,7 @@ file system 0:
mfile start: ino INO offset 0
mfile end: ino INO offset 0
media label: "stress_tape_media"
media id: ID
media ID: ID
session 1:
mount point: HOSTNAME:SCRATCH_MNT
device: HOSTNAME:SCRATCH_DEV
@@ -327,5 +327,5 @@ file system 0:
mfile start: ino INO offset 0
mfile end: ino INO offset 0
media label: "stress_tape_media"
media id: ID
media ID: ID
xfsdump: Dump Status: SUCCESS