Repository: hadoop Updated Branches: refs/heads/branch-2 5e5e693a0 -> d6d642a4e
Update CHANGES.txt to reflect commit of MR-6273 to branch-2.7 (cherry picked from commit ecad1253b782070adc1d825af3ffd2e214823046) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d6d642a4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d6d642a4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d6d642a4 Branch: refs/heads/branch-2 Commit: d6d642a4e3e87f41c1f39f94a19109f36ed64522 Parents: 5e5e693 Author: Jason Lowe <[email protected]> Authored: Thu Oct 29 18:31:27 2015 +0000 Committer: Jason Lowe <[email protected]> Committed: Thu Oct 29 18:33:24 2015 +0000 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d6d642a4/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index b52fa13..9200a0c 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -229,10 +229,6 @@ Release 2.8.0 - UNRELEASED MAPREDUCE-5708. Duplicate String.format in YarnOutputFiles.getSpillFileForWrite. (Konstantin Weitz via devaraj) - MAPREDUCE-6273. HistoryFileManager should check whether summaryFile exists to - avoid FileNotFoundException causing HistoryFileInfo into MOVE_FAILED state. - (zhihai xu via devaraj) - MAPREDUCE-6204. TestJobCounters should use new properties instead of JobConf.MAPRED_TASK_JAVA_OPTS. (Sam Liu via ozawa) @@ -390,6 +386,10 @@ Release 2.7.2 - UNRELEASED MAPREDUCE-6518. Set SO_KEEPALIVE on shuffle connections (Chang Li via jlowe) + MAPREDUCE-6273. HistoryFileManager should check whether summaryFile exists to + avoid FileNotFoundException causing HistoryFileInfo into MOVE_FAILED state. + (zhihai xu via devaraj) + Release 2.7.1 - 2015-07-06 INCOMPATIBLE CHANGES
