Merge commit 'refs/top-bases/top' into topzfs-0.4.1

3 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index eed43af51..25f2dccbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-1-21 Brian Behlendorf <[email protected]>
+
+	* : Tag zfs-0.4.1
+
+	* : Rebased to ZFS b105 from OpenSolaris
+
+	* : Restructured project and build system to more closely
+	mirror the code organization used in OpenSolaris.  This
+	allows us minimize the changes to upstream source needed,
+        and allows concurrent user+kernel space builds of all components.
+
 2008-11-19 Brian Behlendorf <[email protected]>
 
 	* : Tag zfs-0.4.0
diff --git a/META b/META
index d43327990..ba25a889d 100644
--- a/META
+++ b/META
@@ -1,6 +1,6 @@
 Meta:         1
 Name:         zfs
 Branch:       1.0
-Version:      0.4.0
+Version:      0.4.1
 Release:      1
 Release-Tags: relext
diff --git a/TODO b/TODO
index 15fcc8c65..8965bab17 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-SUMMARY OF MAJOR KNOWN PROBLEMS IN v0.4.0 (Development Release)
+SUMMARY OF MAJOR KNOWN PROBLEMS IN v0.4.1 (Development Release)
 
 - 'zpool create' hangs in the create ioctl() when initializing a new pool
   backed by loopback devices.  The lo-raid0 configuration easily recreates