Author: tgraves Date: Tue Apr 17 19:23:01 2012 New Revision: 1327234 URL: http://svn.apache.org/viewvc?rev=1327234&view=rev Log: merge -r 1327232:1327233 from trunk. FIXES: MAPREDUCE-4160
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/JobInProgress.java Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1327234&r1=1327233&r2=1327234&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue Apr 17 19:23:01 2012 @@ -246,6 +246,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-2/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/JobInProgress.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/JobInProgress.java?rev=1327234&r1=1327233&r2=1327234&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/JobInProgress.java (original) +++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/JobInProgress.java Tue Apr 17 19:23:01 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()));