tez git commit: TEZ-2080. Localclient should be using tezconf in init instead of yarnconf. (sseth) (cherry picked from commit 269905b112f35b5014d60bacd9d8962c16e2fc8d)

[sseth]

Repository: tez
Updated Branches:
  refs/heads/branch-0.5 0595d28aa -> 4e57a922b


TEZ-2080. Localclient should be using tezconf in init instead of
yarnconf. (sseth)
(cherry picked from commit 269905b112f35b5014d60bacd9d8962c16e2fc8d)

Conflicts:
        CHANGES.txt
(cherry picked from commit c1d334b4dc1766e83658dafffc58e33c2b8e731d)


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

Branch: refs/heads/branch-0.5
Commit: 4e57a922b4a38a0b2f0e22e0f914a4a8f9698878
Parents: 0595d28
Author: Siddharth Seth <ss...@apache.org>
Authored: Wed Feb 18 11:25:41 2015 -0800
Committer: Siddharth Seth <ss...@apache.org>
Committed: Fri May 22 10:10:59 2015 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                  | 1 +
 tez-dag/src/main/java/org/apache/tez/client/LocalClient.java | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/4e57a922/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b752289..8d5958b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,7 @@ Apache Tez Change Log
 Release 0.5.4: Unreleased
 
 ALL CHANGES:
+  TEZ-2080. Localclient should be using tezconf in init instead of yarnconf.
   TEZ-2369. Add a few unit tests for RootInputInitializerManager. Backport a 
findbugs warning fix from master.
   TEZ-2379. org.apache.hadoop.yarn.state.InvalidStateTransitonException:
     Invalid event: T_ATTEMPT_KILLED at KILLED.

http://git-wip-us.apache.org/repos/asf/tez/blob/4e57a922/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java 
b/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java
index 1c0c912..aa0067b 100644
--- a/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java
+++ b/tez-dag/src/main/java/org/apache/tez/client/LocalClient.java
@@ -77,11 +77,11 @@ public class LocalClient extends FrameworkClient {
 
   @Override
   public void init(TezConfiguration tezConf, YarnConfiguration yarnConf) {
-    this.conf = yarnConf;
+    this.conf = tezConf;
     tezConf.set("fs.defaultFS", "file:///");
     // Tez libs already in the client's classpath
-    tezConf.setBoolean(TezConfiguration.TEZ_IGNORE_LIB_URIS, true);
-    tezConf.set(TezConfiguration.TEZ_AM_DAG_SCHEDULER_CLASS, 
localModeDAGSchedulerClassName);
+    this.conf.setBoolean(TezConfiguration.TEZ_IGNORE_LIB_URIS, true);
+    this.conf.set(TezConfiguration.TEZ_AM_DAG_SCHEDULER_CLASS, 
localModeDAGSchedulerClassName);
     isSession = tezConf.getBoolean(TezConfiguration.TEZ_AM_SESSION_MODE,
         TezConfiguration.TEZ_AM_SESSION_MODE_DEFAULT);
   }