You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/12/20 14:35:04 UTC

[02/15] ambari git commit: AMBARI-19222 %livy interpreter gives 400 HttpClientError due to spark.master property present in livy-spark-blacklist (Prabhjyot Singh via r-kamath)

AMBARI-19222 %livy interpreter gives 400 HttpClientError due to spark.master property present in livy-spark-blacklist (Prabhjyot Singh via r-kamath)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: fce9d6e090c9433f5783871aab73cdb3e16c9335
Parents: 7ec550a
Author: Renjith Kamath <re...@gmail.com>
Authored: Mon Dec 19 12:40:02 2016 +0530
Committer: Renjith Kamath <re...@gmail.com>
Committed: Mon Dec 19 12:41:13 2016 +0530

----------------------------------------------------------------------
 .../common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py    | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/fce9d6e0/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
index 9cc808b..0b79d37 100644
--- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
+++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
@@ -312,7 +312,6 @@ class Master(Script):
             interpreter['dependencies'].append(
                 {"groupArtifactVersion": "org.apache.phoenix:phoenix-core:4.7.0-HBase-1.1", "local": "false"})
       elif interpreter['group'] == 'livy' and params.livy_livyserver_host:
-        interpreter['properties']['livy.spark.master'] = "yarn-cluster"
         interpreter['properties']['zeppelin.livy.url'] = "http://" + params.livy_livyserver_host +\
                                                       ":" + params.livy_livyserver_port