summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2009-01-21 11:39:21 -0800
committerBrian Behlendorf <[email protected]>2009-01-21 11:39:21 -0800
commit94e448564ddbac465d80ef43ac1435aa458eb662 (patch)
treee95aeefbe7e1ddab26d07446347adfbe5910e195 /ChangeLog
parent528de2563fba956aef18d84cdade052245161c7c (diff)
parent57f89e598c7027331fc9a3bc7e009c8a20602567 (diff)
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog11
1 files changed, 11 insertions, 0 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