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 vi...@apache.org on 2015/03/31 22:30:04 UTC
hadoop git commit: Reverted MAPREDUCE-6286, MAPREDUCE-6199,
and MAPREDUCE-5875 from branch-2.7. Editing CHANGES.txt to reflect
this.
Repository: hadoop
Updated Branches:
refs/heads/trunk 79f7f2aab -> e428fea73
Reverted MAPREDUCE-6286, MAPREDUCE-6199, and MAPREDUCE-5875 from branch-2.7. Editing CHANGES.txt to reflect this.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e428fea7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e428fea7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e428fea7
Branch: refs/heads/trunk
Commit: e428fea73029ea0c3494c71a50c5f6c994888fd2
Parents: 79f7f2a
Author: Vinod Kumar Vavilapalli <vi...@apache.org>
Authored: Tue Mar 31 13:29:20 2015 -0700
Committer: Vinod Kumar Vavilapalli <vi...@apache.org>
Committed: Tue Mar 31 13:29:20 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/e428fea7/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index b0367a7..f5d2d1a 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -311,6 +311,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
@@ -411,10 +421,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)
@@ -448,9 +454,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)
@@ -721,9 +724,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)