tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jeag...@apache.org
Subject [36/50] [abbrv] tez git commit: Preparing TEZ-3334 for mergo to trunk
Date Wed, 24 May 2017 21:08:05 GMT
Preparing TEZ-3334 for mergo to trunk


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

Branch: refs/heads/master
Commit: 54f778427d8a63879193b985bac28ad35a624efc
Parents: be0d01f
Author: Jonathan Eagles <jeagles@yahoo-inc.com>
Authored: Mon Mar 27 17:37:07 2017 -0500
Committer: Jonathan Eagles <jeagles@yahoo-inc.com>
Committed: Mon Mar 27 17:37:07 2017 -0500

----------------------------------------------------------------------
 .../apache/tez/dag/app/rm/container/AMContainerHelpers.java  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/54f77842/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
index 173b458..1e23c8f 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java
@@ -95,11 +95,7 @@ public class AMContainerHelpers {
    */
   private static ContainerLaunchContext createCommonContainerLaunchContext(
       Map<ApplicationAccessType, String> applicationACLs,
-<<<<<<< HEAD
-      Credentials credentials, Map<String, LocalResource> localResources, Configuration
conf) {
-=======
-      Credentials credentials) {
->>>>>>> master
+      Credentials credentials, Configuration conf) {
 
     // Application environment
     Map<String, String> environment = new HashMap<String, String>();
@@ -165,7 +161,7 @@ public class AMContainerHelpers {
     synchronized (commonContainerSpecLock) {
       if (!commonContainerSpecs.containsKey(tezDAGID)) {
         commonContainerSpec =
-            createCommonContainerLaunchContext(acls, credentials);
+            createCommonContainerLaunchContext(acls, credentials, conf);
         commonContainerSpecs.put(tezDAGID, commonContainerSpec);
       } else {
         commonContainerSpec = commonContainerSpecs.get(tezDAGID);


Mime
View raw message