Return-Path: X-Original-To: apmail-tez-commits-archive@minotaur.apache.org Delivered-To: apmail-tez-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CA716184C7 for ; Sat, 12 Dec 2015 01:49:58 +0000 (UTC) Received: (qmail 30674 invoked by uid 500); 12 Dec 2015 01:49:58 -0000 Delivered-To: apmail-tez-commits-archive@tez.apache.org Received: (qmail 30599 invoked by uid 500); 12 Dec 2015 01:49:58 -0000 Mailing-List: contact commits-help@tez.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tez.apache.org Delivered-To: mailing list commits@tez.apache.org Received: (qmail 30525 invoked by uid 99); 12 Dec 2015 01:49:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Dec 2015 01:49:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6B4B1E05D3; Sat, 12 Dec 2015 01:49:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bikas@apache.org To: commits@tez.apache.org Date: Sat, 12 Dec 2015 01:50:02 -0000 Message-Id: <0b8a2178e2504e21b00ad9370cf1ea89@git.apache.org> In-Reply-To: <15da4e53364945ababb54a53bdf09f73@git.apache.org> References: <15da4e53364945ababb54a53bdf09f73@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/5] tez git commit: Fix Hadoop 2.2 compat Fix Hadoop 2.2 compat Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/4d44c585 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/4d44c585 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/4d44c585 Branch: refs/heads/branch-0.7 Commit: 4d44c5854b6ffaff4468a54512dcd5503c28768f Parents: 8973797 Author: Bikas Saha Authored: Fri Dec 11 17:49:33 2015 -0800 Committer: Bikas Saha Committed: Fri Dec 11 17:49:33 2015 -0800 ---------------------------------------------------------------------- tez-dag/src/test/java/org/apache/tez/dag/app/TestDAGAppMaster.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/4d44c585/tez-dag/src/test/java/org/apache/tez/dag/app/TestDAGAppMaster.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/TestDAGAppMaster.java b/tez-dag/src/test/java/org/apache/tez/dag/app/TestDAGAppMaster.java index 60251d4..2390c79 100644 --- a/tez-dag/src/test/java/org/apache/tez/dag/app/TestDAGAppMaster.java +++ b/tez-dag/src/test/java/org/apache/tez/dag/app/TestDAGAppMaster.java @@ -117,7 +117,7 @@ public class TestDAGAppMaster { .writeDelimitedTo(sessionJarsPBOutStream); sessionJarsPBOutStream.close(); DAGAppMaster am = new DAGAppMaster(attemptId, - ContainerId.newContainerId(attemptId, 1), + ContainerId.newInstance(attemptId, 1), "127.0.0.1", 0, 0, new SystemClock(), 1, true, TEST_DIR.toString(), new String[] {TEST_DIR.toString()}, new String[] {TEST_DIR.toString()},