tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hit...@apache.org
Subject tez git commit: TEZ-2374. Fix build break against hadoop-2.2 due to TEZ-2325. (hitesh)
Date Tue, 28 Apr 2015 15:34:30 GMT
Repository: tez
Updated Branches:
  refs/heads/master 252244773 -> ecf8c4322


TEZ-2374. Fix build break against hadoop-2.2 due to TEZ-2325. (hitesh)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/ecf8c432
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/ecf8c432
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/ecf8c432

Branch: refs/heads/master
Commit: ecf8c43227c0cbb4dd8c460b22942f8e6e65a410
Parents: 2522447
Author: Hitesh Shah <hitesh@apache.org>
Authored: Tue Apr 28 08:33:04 2015 -0700
Committer: Hitesh Shah <hitesh@apache.org>
Committed: Tue Apr 28 08:33:49 2015 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                      | 1 +
 .../apache/tez/dag/app/TestTaskAttemptListenerImplTezDag.java    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/ecf8c432/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0bd5214..9ea191d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,7 @@ INCOMPATIBLE CHANGES
   TEZ-1993. Implement a pluggable InputSizeEstimator for grouping fairly
 
 ALL CHANGES:
+  TEZ-2374. Fix build break against hadoop-2.2 due to TEZ-2325.
   TEZ-2314. Tez task attempt failures due to bad event serialization
   TEZ-2368. Make a dag identifier available in Context classes.
   TEZ-2325. Route status update event directly to the attempt.

http://git-wip-us.apache.org/repos/asf/tez/blob/ecf8c432/tez-dag/src/test/java/org/apache/tez/dag/app/TestTaskAttemptListenerImplTezDag.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/TestTaskAttemptListenerImplTezDag.java
b/tez-dag/src/test/java/org/apache/tez/dag/app/TestTaskAttemptListenerImplTezDag.java
index b0ff0e3..ec4f99a 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/TestTaskAttemptListenerImplTezDag.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/TestTaskAttemptListenerImplTezDag.java
@@ -245,9 +245,9 @@ public class TestTaskAttemptListenerImplTezDag {
   }
 
 
-  private ContainerId createContainerId(ApplicationId applicationId, long containerIdx) {
+  private ContainerId createContainerId(ApplicationId applicationId, int containerIdx) {
     ApplicationAttemptId appAttemptId = ApplicationAttemptId.newInstance(applicationId, 1);
-    return ContainerId.newContainerId(appAttemptId, containerIdx);
+    return ContainerId.newInstance(appAttemptId, containerIdx);
   }
 
   private static class TaskAttemptListenerImplForTest extends TaskAttemptListenerImpTezDag
{


Mime
View raw message