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

2 files changed, 15 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 25f2dccbc..d65a35615 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,17 @@
-2009-1-21 Brian Behlendorf <behlendorf1@llnl.gov>
+2009-02-05 Brian Behlendorf <behlendorf1@llnl.gov>
+
+	* : Tag zfs-0.4.2
+
+	* lib/libzfs/libzfs_util.c: Remove mknod() this is now handled by
+	by the SPL with an upcall even without GPL-only symbols.
+
+	* module/zfs/vdev_diskc: Updated linux vdev_disk interfaces to issue
+	multiple bios if needed due to the maximum request size being smaller
+	than the request size passed down from the spa.
+
+	* scripts/zpool-config/lo-*: Add loopback based test configs.
+
+2009-01-21 Brian Behlendorf <behlendorf1@llnl.gov>
 
 	* : Tag zfs-0.4.1
 
diff --git a/META b/META
index ba25a889d..a931c7af9 100644
--- a/META
+++ b/META
@@ -1,6 +1,6 @@
 Meta:         1
 Name:         zfs
 Branch:       1.0
-Version:      0.4.1
+Version:      0.4.2
 Release:      1
 Release-Tags: relext