summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--mdadm.conf-example2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e52c40d7..847e13c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
Changes Prior to this release
+ Several of these are backported from the Debian package
- Don't use 'lstat' to check for blockdevices, use stat.
- Document --size=max option for --grow
- Document SparesMissing event and DeviceDisappeared/WrongLevel
@@ -12,6 +13,7 @@ Changes Prior to this release
- Fix a few type casts
- Fix parsing of /dev/md/N in is_standard
- Fix rounding errors in human_size()
+ - Fix silly example in mdadm.conf-examples
Changes Prior to 1.11.0 release
- Fix embarassing bug which causes --add to always fail.
diff --git a/mdadm.conf-example b/mdadm.conf-example
index 09c79893..2d83fc0b 100644
--- a/mdadm.conf-example
+++ b/mdadm.conf-example
@@ -40,7 +40,7 @@
#
#ARRAY /dev/md0 UUID=3aaa0122:29827cfa:5331ad66:ca767371
#ARRAY /dev/md1 super-minor=1
-#ARRAY /dev/md2 devices=/dev/hda1,/dev/hda2
+#ARRAY /dev/md2 devices=/dev/hda1,/dev/hdb1
#
# ARRAY lines can also specify a "spare-group" for each array. mdadm --monitor
# will then move a spare between arrays in a spare-group if one array has a failed