You are viewing a plain text version of this content. The canonical link for it is here.

Posted to common-commits@hadoop.apache.org by ac...@apache.org on 2012/09/25 19:53:15 UTC

svn commit: r1390021 - /hadoop/common/branches/branch-1/CHANGES.txt

Author: acmurthy
Date: Tue Sep 25 17:53:14 2012
New Revision: 1390021

URL: http://svn.apache.org/viewvc?rev=1390021&view=rev
Log:
HADOOP-8617. Merging to branch-1.1.

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1390021&r1=1390020&r2=1390021&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Tue Sep 25 17:53:14 2012
@@ -53,9 +53,6 @@ Release 1.2.0 - unreleased
     MAPREDUCE-4415. Backport the Job.getInstance methods from
     MAPREDUCE-1505 to branch-1. (harsh)
 
-    HADOOP-8617. Backport HADOOP-6148, HADOOP-6166 and HADOOP-7333 for a pure
-    Java CRC32 calculator implementation.  (Brandon Li via szetszwo)
-
     HDFS-496. Backport: Use PureJavaCrc32 in HDFS.  (Brandon Li via szetszwo)
 
     MAPREDUCE-782. Use PureJavaCrc32 in mapreduce spills. 
@@ -402,6 +399,9 @@ Release 1.1.0 - unreleased
     JobTracker for smaller clusters. (Todd Lipcon, backport by 
     Brandon Li via sseth)
 
+    HADOOP-8617. Backport HADOOP-6148, HADOOP-6166 and HADOOP-7333 for a pure
+    Java CRC32 calculator implementation.  (Brandon Li via szetszwo)
+
   BUG FIXES
 
     HDFS-3696. Set chunked streaming mode in WebHdfsFileSystem write operations