Author: acmurthy
Date: Mon Jun 3 21:35:33 2013
New Revision: 1489188
URL: http://svn.apache.org/r1489188
Log:
Merge -c 1489187 from trunk to branch-2 to fix MAPREDUCE-5220. Fix backward
incompatibility for TaskCompletionEvent by adding back setTaskID. Contributed
by Zhijie Shen.
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskCompletionEvent.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=1489188&r1=1489187&r2=1489188&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Mon
Jun 3 21:35:33 2013
@@ -344,6 +344,9 @@ Release 2.1.0-beta - UNRELEASED
of the entire Container in the startContainer call - YARN-684.
(Vinod Kumar Vavilapalli via sseth)
+ MAPREDUCE-5220. Fix backward incompatibility for TaskCompletionEvent by
+ adding back setTaskID. (Zhijie Shen via acmurthy)
+
BREAKDOWN OF HADOOP-8562 SUBTASKS
MAPREDUCE-4739. Some MapReduce tests fail to find winutils.
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskCompletionEvent.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskCompletionEvent.java?rev=1489188&r1=1489187&r2=1489188&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskCompletionEvent.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskCompletionEvent.java
Mon Jun 3 21:35:33 2013
@@ -105,7 +105,17 @@ public class TaskCompletionEvent
public void setTaskId(String taskId) {
this.setTaskAttemptId(TaskAttemptID.forName(taskId));
}
-
+
+ /**
+ * Sets task id.
+ * @param taskId
+ * @deprecated use {@link #setTaskAttemptId(TaskAttemptID)} instead.
+ */
+ @Deprecated
+ public void setTaskID(TaskAttemptID taskId) {
+ this.setTaskAttemptId(taskId);
+ }
+
/**
* Sets task id.
* @param taskId
