Author: tgraves Date: Mon Apr 16 20:48:56 2012 New Revision: 1326797 URL: http://svn.apache.org/viewvc?rev=1326797&view=rev Log: merge -r 1326795:1326796 from branch-2. FIXES: MAPREDUCE-4156
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 hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobHistoryParsing.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=1326797&r1=1326796&r2=1326797&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 Mon Apr 16 20:48:56 2012 @@ -97,6 +97,8 @@ Release 0.23.3 - UNRELEASED MAPREDUCE-4144. Fix a NPE in the ResourceManager when handling node updates. (Jason Lowe via sseth) + MAPREDUCE-4156. ant build fails compiling JobInProgress (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=1326797&r1=1326796&r2=1326797&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 Mon Apr 16 20:48:56 2012 @@ -2710,7 +2710,7 @@ public class JobInProgress { } TaskFinishedEvent tfe = new TaskFinishedEvent(tip.getTIPId(), - tip.getExecFinishTime(), taskType, + null, tip.getExecFinishTime(), taskType, TaskStatus.State.SUCCEEDED.toString(), new org.apache.hadoop.mapreduce.Counters(status.getCounters())); Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobHistoryParsing.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobHistoryParsing.java?rev=1326797&r1=1326796&r2=1326797&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobHistoryParsing.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobHistoryParsing.java Mon Apr 16 20:48:56 2012 @@ -97,7 +97,7 @@ public class TestJobHistoryParsing exte // Try to write one more event now, should not fail TaskID tid = TaskID.forName("task_200809171136_0001_m_000002"); TaskFinishedEvent tfe = - new TaskFinishedEvent(tid, 0, TaskType.MAP, "", null); + new TaskFinishedEvent(tid, null, 0, TaskType.MAP, "", null); boolean caughtException = false; try {