Repository: ambari Updated Branches: refs/heads/branch-2.5 904ff8d3e -> 3cea98fcd refs/heads/trunk 7ec550aae -> fce9d6e09
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/3cea98fc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3cea98fc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3cea98fc Branch: refs/heads/branch-2.5 Commit: 3cea98fcd49949779a1749bd49362510d7c4b349 Parents: 904ff8d Author: Renjith Kamath <[email protected]> Authored: Mon Dec 19 12:40:02 2016 +0530 Committer: Renjith Kamath <[email protected]> Committed: Mon Dec 19 12:40:02 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/3cea98fc/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
