You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by ss...@apache.org on 2015/02/18 23:40:56 UTC
[09/23] tez git commit: TEZ-2095. master branch fails to compile
against hadoop-2.4. (hitesh)
TEZ-2095. master branch fails to compile against hadoop-2.4. (hitesh)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/8e138a22
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/8e138a22
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/8e138a22
Branch: refs/heads/TEZ-2003
Commit: 8e138a22e8aaca3d6e6bc94030b6ddebcf2a37e3
Parents: 48fd4d6
Author: Hitesh Shah <hi...@apache.org>
Authored: Fri Feb 13 15:58:39 2015 -0800
Committer: Hitesh Shah <hi...@apache.org>
Committed: Fri Feb 13 15:58:39 2015 -0800
----------------------------------------------------------------------
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/8e138a22/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d316290..33f9614 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ Release 0.7.0: Unreleased
INCOMPATIBLE CHANGES
ALL CHANGES:
+ TEZ-2095. master branch fails to compile against hadoop-2.4.
TEZ-2093. Add events to MockDAGAppMaster and add e2e test for event routing
TEZ-2075. Incompatible issue caused by TEZ-1233 that TezConfiguration.TEZ_SITE_XML is made private
TEZ-2082. Race condition in TaskAttemptListenerImpTezDag.getTask()
http://git-wip-us.apache.org/repos/asf/tez/blob/8e138a22/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 599a289..f0f7dc5 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
@@ -156,9 +156,9 @@ public class TestTaskAttemptListenerImplTezDag {
assertNull(containerTask);
}
- private ContainerId createContainerId(ApplicationId applicationId, long containerIdLong) {
+ private ContainerId createContainerId(ApplicationId applicationId, int containerIdx) {
ApplicationAttemptId appAttemptId = ApplicationAttemptId.newInstance(applicationId, 1);
- ContainerId containerId = ContainerId.newContainerId(appAttemptId, containerIdLong);
+ ContainerId containerId = ContainerId.newInstance(appAttemptId, containerIdx);
return containerId;
}