Author: acmurthy
Date: Tue Sep 25 16:11:46 2012
New Revision: 1389958
URL: http://svn.apache.org/viewvc?rev=1389958&view=rev
Log:
MAPREDUCE-3289. 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=1389958&r1=1389957&r2=1389958&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Tue Sep 25 16:11:46 2012
@@ -76,9 +76,6 @@ Release 1.2.0 - unreleased
HDFS-3697. Enable fadvise readahead by default. (todd via eli)
- MAPREDUCE-3289. Make use of fadvise in the NM's shuffle handler.
- (Todd Lipcon and Brandon Li via sseth)
-
MAPREDUCE-4511. Add IFile readahead (ahmed via tucu)
MAPREDUCE-4565. Backport MR-2855 to branch-1: ResourceBundle lookup during
@@ -407,6 +404,9 @@ Release 1.1.0 - unreleased
HDFS-3814. Make the replication monitor multipliers configurable in 1.x.
(Jing Zhao via suresh)
+ MAPREDUCE-3289. Make use of fadvise in the NM's shuffle handler.
+ (Todd Lipcon and Brandon Li via sseth)
+
BUG FIXES
HDFS-3696. Set chunked streaming mode in WebHdfsFileSystem write operations
