You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rk...@apache.org on 2016/12/22 07:14:25 UTC
[1/2] ambari git commit: AMBARI-19265 Zeppelin fails to install when
hive-site.xml does not exist in spark conf directory (r-kamath)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 fa4dab96d -> 66cb2f3bd
refs/heads/trunk b9271c308 -> 170d3bef6
AMBARI-19265 Zeppelin fails to install when hive-site.xml does not exist in spark conf directory (r-kamath)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/66cb2f3b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/66cb2f3b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/66cb2f3b
Branch: refs/heads/branch-2.5
Commit: 66cb2f3bd14e39a6468b07981eba7fe3f5cf2e48
Parents: fa4dab9
Author: Renjith Kamath <re...@gmail.com>
Authored: Thu Dec 22 12:43:25 2016 +0530
Committer: Renjith Kamath <re...@gmail.com>
Committed: Thu Dec 22 12:43:25 2016 +0530
----------------------------------------------------------------------
.../common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/66cb2f3b/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 0b79d37..39941f7 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
@@ -55,9 +55,6 @@ class Master(Script):
mode=0755
)
- # update the configs specified by user
- self.configure(env)
-
if params.spark_version:
Execute('echo spark_version:' + str(params.spark_version) + ' detected for spark_home: '
+ params.spark_home + ' >> ' + params.zeppelin_log_file, user=params.zeppelin_user)
[2/2] ambari git commit: AMBARI-19265 Zeppelin fails to install when
hive-site.xml does not exist in spark conf directory (r-kamath)
Posted by rk...@apache.org.
AMBARI-19265 Zeppelin fails to install when hive-site.xml does not exist in spark conf directory (r-kamath)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/170d3bef
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/170d3bef
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/170d3bef
Branch: refs/heads/trunk
Commit: 170d3bef601da41952e466d49147e8772d5fa303
Parents: b9271c3
Author: Renjith Kamath <re...@gmail.com>
Authored: Thu Dec 22 12:43:25 2016 +0530
Committer: Renjith Kamath <re...@gmail.com>
Committed: Thu Dec 22 12:44:05 2016 +0530
----------------------------------------------------------------------
.../common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/170d3bef/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 0b79d37..39941f7 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
@@ -55,9 +55,6 @@ class Master(Script):
mode=0755
)
- # update the configs specified by user
- self.configure(env)
-
if params.spark_version:
Execute('echo spark_version:' + str(params.spark_version) + ' detected for spark_home: '
+ params.spark_home + ' >> ' + params.zeppelin_log_file, user=params.zeppelin_user)