Repository: hadoop Updated Branches: refs/heads/branch-2 85c420a4d -> 4cf44bef5
Reverted MAPREDUCE-6286, MAPREDUCE-6199, and MAPREDUCE-5875 from branch-2.7. Editing CHANGES.txt to reflect this. (cherry picked from commit e428fea73029ea0c3494c71a50c5f6c994888fd2) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4cf44bef Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4cf44bef Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4cf44bef Branch: refs/heads/branch-2 Commit: 4cf44bef5ca5fee69f712c448f6969e2e046d495 Parents: 85c420a Author: Vinod Kumar Vavilapalli <[email protected]> Authored: Tue Mar 31 13:29:20 2015 -0700 Committer: Vinod Kumar Vavilapalli <[email protected]> Committed: Tue Mar 31 13:30:22 2015 -0700 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4cf44bef/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 3efe73a..34aa2ed 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -66,6 +66,16 @@ Release 2.8.0 - UNRELEASED MAPREDUCE-6294. Remove an extra parameter described in Javadoc of TockenCache. (Brahma Reddy Battula via ozawa) + MAPREDUCE-5875. Make Counter limits consistent across JobClient, + MRAppMaster, and YarnChild. (Gera Shegalov via kasha) + + MAPREDUCE-6199. AbstractCounters are not reset completely on + deserialization (adhoot via rkanter) + + MAPREDUCE-6286. A typo in HistoryViewer makes some code useless, which + causes counter limits are not reset correctly. + (Zhihai Xu via harsh) + Release 2.7.0 - UNRELEASED INCOMPATIBLE CHANGES @@ -166,10 +176,6 @@ Release 2.7.0 - UNRELEASED BUG FIXES - MAPREDUCE-6286. A typo in HistoryViewer makes some code useless, which - causes counter limits are not reset correctly. - (Zhihai Xu via harsh) - MAPREDUCE-6210. Use getApplicationAttemptId() instead of getApplicationId() for logging AttemptId in RMContainerAllocator.java (Leitao Guo via aajisaka) @@ -203,9 +209,6 @@ Release 2.7.0 - UNRELEASED MAPREDUCE-6045. need close the DataInputStream after open it in TestMapReduce.java (zxu via rkanter) - MAPREDUCE-6199. AbstractCounters are not reset completely on - deserialization (adhoot via rkanter) - MAPREDUCE-6206. TestAggregatedTransferRate fails on non-US systems (Jens Rabe via jlowe) @@ -478,9 +481,6 @@ Release 2.6.0 - 2014-11-18 MAPREDUCE-6123. TestCombineFileInputFormat incorrectly starts 2 MiniDFSCluster instances. (cnauroth) - MAPREDUCE-5875. Make Counter limits consistent across JobClient, - MRAppMaster, and YarnChild. (Gera Shegalov via kasha) - MAPREDUCE-6125. TestContainerLauncherImpl sometimes fails (Mit Desai via jlowe)
