Author: acmurthy
Date: Tue Sep 25 17:56:04 2012
New Revision: 1390024

URL: http://svn.apache.org/viewvc?rev=1390024&view=rev
Log:
HDFS-496 & MAPREDUCE-782. 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=1390024&r1=1390023&r2=1390024&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Tue Sep 25 17:56:04 2012
@@ -53,11 +53,6 @@ Release 1.2.0 - unreleased
     MAPREDUCE-4415. Backport the Job.getInstance methods from
     MAPREDUCE-1505 to branch-1. (harsh)
 
-    HDFS-496. Backport: Use PureJavaCrc32 in HDFS.  (Brandon Li via szetszwo)
-
-    MAPREDUCE-782. Use PureJavaCrc32 in mapreduce spills. 
-    (Todd Lipcon, backport by Brandon Li via sseth)
-
     HDFS-3667.  Add retry support to WebHdfsFileSystem.  (szetszwo)
 
     HDFS-3697. Enable fadvise readahead by default. (todd via eli)
@@ -402,6 +397,11 @@ Release 1.1.0 - unreleased
     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. 
+    (Todd Lipcon, backport by Brandon Li via sseth)
+
   BUG FIXES
 
     HDFS-3696. Set chunked streaming mode in WebHdfsFileSystem write operations


Reply via email to