Merge branch 'master' into devel-3.1

8 files changed, 49 insertions, 5 deletions

diff --git a/ANNOUNCE-3.0.3 b/ANNOUNCE-3.0.3
new file mode 100644
index 00000000..d6117a1d
--- /dev/null
+++ b/ANNOUNCE-3.0.3
@@ -0,0 +1,29 @@
+Subject:  ANNOUNCE: mdadm 3.0.3 - A tool for managing Soft RAID under Linux
+
+I am pleased to announce the availability of
+   mdadm version 3.0.3
+
+It is available at the usual places:
+   countrycode=xx.
+   http://www.${countrycode}kernel.org/pub/linux/utils/raid/mdadm/
+and via git at
+   git://neil.brown.name/mdadm
+   http://neil.brown.name/git?p=mdadm
+
+
+This contains a collection of bug fixes and minor enhancements over
+3.0.1.
+
+The brief change log is:
+   -    Improvements for creating arrays giving just a name, like 'foo',
+	rather than the full '/dev/md/foo'.
+   -    Improvements for assembling member arrays of containers.
+   -    Improvements to test suite
+   -    Add option to change increment for RebuildNN messages reported
+	by "mdadm --monitor"
+   -    Improvements to mdmon 'hand-over' from initrd to final root.
+   -    Handle merging of devices that have left an IMSM array and are
+	being re-incorporated.
+   -    Add missing space in "--detail --brief" output.
+	
+NeilBrown 22nd October 2009
diff --git a/ChangeLog b/ChangeLog
index e829cfe7..f2e60ee3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,18 @@
 Please see git logs for detailed change log.
 This file just contains highlight.
 
+Changes Prior to release 3.0.3
+   -    Improvements for creating arrays giving just a name, like 'foo',
+	rather than the full '/dev/md/foo'.
+   -    Improvements for assembling member arrays of containers.
+   -    Improvements to test suite
+   -    Add option to change increment for RebuildNN messages reported
+	by "mdadm --monitor"
+   -    Improvements to mdmon 'hand-over' from initrd to final root.
+   -    Handle merging of devices that have left an IMSM array and are
+	being re-incorporated.
+   -    Add missing space in "--detail --brief" output.
+	
 Changes Prior to release 3.0.2
    -    Fix crash when hosthost is not set, as often happens in
 	early boot.
diff --git a/ReadMe.c b/ReadMe.c
index f5f15c77..fbd6aed8 100644
--- a/ReadMe.c
+++ b/ReadMe.c
@@ -24,7 +24,7 @@
 
 #include "mdadm.h"
 
-char Version[] = Name " - v3.0.2 - 25th September 2009\n";
+char Version[] = Name " - v3.0.3 - 22nd October 2009\n";
 
 /*
  * File: ReadMe.c
diff --git a/inventory b/inventory
index 63e3a0ac..f0f7dacb 100755
--- a/inventory
+++ b/inventory
@@ -2,6 +2,7 @@
 ANNOUNCE-3.0
 ANNOUNCE-3.0.1
 ANNOUNCE-3.0.2
+ANNOUNCE-3.0.3
 Assemble.c
 bitmap.c
 bitmap.h
@@ -123,10 +124,12 @@ tests/07autodetect
 tests/07reshape5intr
 tests/07testreshape5
 tests/08imsm-overlap
+tests/09imsm-assemble
 tests/09imsm-create-fail-rebuild
 tests/10ddf-create
 tests/check
 tests/env-08imsm-overlap
+tests/env-09imsm-assemble
 tests/env-09imsm-create-fail-rebuild
 tests/testdev
 tests/ToTest
diff --git a/mdadm.8 b/mdadm.8
index ab02558e..62cc1e10 100644
--- a/mdadm.8
+++ b/mdadm.8
@@ -5,7 +5,7 @@
 .\"   the Free Software Foundation; either version 2 of the License, or
 .\"   (at your option) any later version.
 .\" See file COPYING in distribution for details.
-.TH MDADM 8 "" v3.0.2
+.TH MDADM 8 "" v3.0.3
 .SH NAME
 mdadm \- manage MD devices
 .I aka
diff --git a/mdadm.spec b/mdadm.spec
index 7ea4c8c5..6bc36cde 100644
--- a/mdadm.spec
+++ b/mdadm.spec
@@ -1,6 +1,6 @@
 Summary:     mdadm is used for controlling Linux md devices (aka RAID arrays)
 Name:        mdadm
-Version:     3.0.2
+Version:     3.0.3
 Release:     1
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tgz
 URL:         http://neil.brown.name/blog/mdadm
diff --git a/mdassemble.8 b/mdassemble.8
index cedcd0f2..5520e8ef 100644
--- a/mdassemble.8
+++ b/mdassemble.8
@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
-.TH MDASSEMBLE 8 "" v3.0.2
+.TH MDASSEMBLE 8 "" v3.0.3
 .SH NAME
 mdassemble \- assemble MD devices
 .I aka
diff --git a/mdmon.8 b/mdmon.8
index 6092812a..41af50d0 100644
--- a/mdmon.8
+++ b/mdmon.8
@@ -1,5 +1,5 @@
 .\" See file COPYING in distribution for details.
-.TH MDMON 8 "" v3.0.2
+.TH MDMON 8 "" v3.0.3
 .SH NAME
 mdmon \- monitor MD external metadata arrays