You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by tg...@apache.org on 2012/04/17 21:25:02 UTC
svn commit: r1327235 - in
/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt
src/java/org/apache/hadoop/mapred/JobInProgress.java
Author: tgraves
Date: Tue Apr 17 19:25:02 2012
New Revision: 1327235
URL: http://svn.apache.org/viewvc?rev=1327235&view=rev
Log:
merge -r 1327233:1327234 from branch-2. FIXES: MAPREDUCE-4160
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/JobInProgress.java
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1327235&r1=1327234&r2=1327235&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Tue Apr 17 19:25:02 2012
@@ -103,6 +103,9 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-4156. ant build fails compiling JobInProgress (tgraves)
+ MAPREDUCE-4160. some mrv1 ant tests fail with timeout - due to 4156
+ (tgraves)
+
Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/JobInProgress.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/JobInProgress.java?rev=1327235&r1=1327234&r2=1327235&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/JobInProgress.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/JobInProgress.java Tue Apr 17 19:25:02 2012
@@ -2710,7 +2710,7 @@ public class JobInProgress {
}
TaskFinishedEvent tfe = new TaskFinishedEvent(tip.getTIPId(),
- null, tip.getExecFinishTime(), taskType,
+ statusAttemptID, tip.getExecFinishTime(), taskType,
TaskStatus.State.SUCCEEDED.toString(),
new org.apache.hadoop.mapreduce.Counters(status.getCounters()));