Add two fixes to release notes for 1.1.0-rc5. Move three fixes in CHANGES.txt from 1.1.0 to 1.0.4 in anticipation of 1.0.4 release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.1@1394289 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 4e465ba..75211a2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -155,12 +155,6 @@
HDFS-2465. Add HDFS support for fadvise readahead and drop-behind.
(todd via suresh)
- HADOOP-7154. Should set MALLOC_ARENA_MAX in hadoop-env.sh
- (todd via mattf)
-
- MAPREDUCE-4399. Change the Jetty response buffer size to improve
- shuffle performance. (Luke Lu via suresh)
-
MAPREDUCE-4400. Avoid task finish sleep to improve small job/workflow
latency. (llu)
@@ -410,12 +404,18 @@
MAPREDUCE-4698. Fix failing unit test - TestJobHistoryConfig. Optionally
initialize the jobtracker on a JobTracker.startTracker. (Gopal V via sseth)
-Release 1.0.4 - Unreleased
+Release 1.0.4 - 2012.10.02
NEW FEATURES
IMPROVEMENTS
+ HADOOP-7154. Should set MALLOC_ARENA_MAX in hadoop-env.sh
+ (todd via mattf)
+
+ MAPREDUCE-4399. Change the Jetty response buffer size to improve
+ shuffle performance. (Luke Lu via suresh)
+
BUG FIXES
HDFS-3652. FSEditLog failure removes the wrong edit stream when storage
diff --git a/src/docs/releasenotes.html b/src/docs/releasenotes.html
index ebe2fb2..5d53998 100644
--- a/src/docs/releasenotes.html
+++ b/src/docs/releasenotes.html
Binary files differ
