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

CHANGES.txt

@@ -155,12 +155,6 @@ Release 1.1.0 - 2012.09.28
     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 @@ Release 1.1.0 - 2012.09.28
     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

src/docs/releasenotes.html

@@ -202,6 +202,14 @@ Please see hdfs-default.xml for detailed description.
      <blockquote>                                          Fixed a race condition caused in TestKillSubProcesses caused due to a recent commit.
 
       
+</blockquote></li>
+
+<li> <a href="https://issues.apache.org/jira/browse/MAPREDUCE-4698">MAPREDUCE-4698</a>.
+     Minor bug reported by gopalv and fixed by gopalv <br>
+     <b>TestJobHistoryConfig throws Exception in testJobHistoryLogging</b><br>
+     <blockquote>                                          Optionally call initialize/initializeFileSystem in JobTracker::startTracker() to allow for proper initialization when offerService is not being called.
+
+      
 </blockquote></li>
 
 </ul>
@@ -530,6 +538,12 @@ Please see hdfs-default.xml for detailed description.
      <b>HDFS does not use ClientProtocol in a backward-compatible way</b><br>
      <blockquote>HDFS-617 was brought into branch-0.20-security/branch-1 to support non-recursive create, along with HADOOP-6840 and HADOOP-6886. However, the changes in HDFS was done in an incompatible way, making the client unusable against older clusters, even when plain old create() is called. This is because DFS now internally calls create() through the newly introduced method. By simply changing how the methods are wired internally, we can remove this limitation. We may eventually switch back to the app...</blockquote></li>
 
+<li> <a href="https://issues.apache.org/jira/browse/HDFS-3461">HDFS-3461</a>.
+     Major bug reported by owen.omalley and fixed by owen.omalley <br>
+     <b>HFTP should use the same port &amp; protocol for getting the delegation token</b><br>
+     <blockquote>Currently, hftp uses http to the Namenode&apos;s https port, which doesn&apos;t work.</blockquote></li>
+
+
 <li> <a href="https://issues.apache.org/jira/browse/HDFS-3466">HDFS-3466</a>.
      Major bug reported by owen.omalley and fixed by owen.omalley (name-node, security)<br>
      <b>The SPNEGO filter for the NameNode should come out of the web keytab file</b><br>