diff options
| author | NeilBrown <neilb@suse.de> | 2008-12-18 06:56:13 +0100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2008-12-18 06:56:13 +0100 |
| commit | 8a659c33212f85cc0dcecc759b7b36b0bb2b4fe4 (patch) | |
| tree | 8c09f1ce1ab41c6218a0e4705e3227bc7b7c022b /mdadm.conf.5 | |
| parent | DDF: improve --examine output (diff) | |
| parent | map: rebuild map if it doesn't exist. (diff) | |
| download | mdadm-8a659c33212f85cc0dcecc759b7b36b0bb2b4fe4.tar.xz mdadm-8a659c33212f85cc0dcecc759b7b36b0bb2b4fe4.zip | |
Merge branch 'master' into devel-3.0
Conflicts:
Assemble.c
Incremental.c
Kill.c
ReadMe.c
inventory
mapfile.c
mdadm.8
mdadm.spec
mdassemble.8
Diffstat (limited to 'mdadm.conf.5')
| -rw-r--r-- | mdadm.conf.5 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mdadm.conf.5 b/mdadm.conf.5 index a02fe141..0cea47cf 100644 --- a/mdadm.conf.5 +++ b/mdadm.conf.5 @@ -340,7 +340,7 @@ DEVICE /dev/sd[bcdjkl]1 .br DEVICE /dev/hda1 /dev/hdb1 -# /dev/md0 is known by its UID. +# /dev/md0 is known by its UUID. .br ARRAY /dev/md0 UUID=3aaa0122:29827cfa:5331ad66:ca767371 .br |