ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rkam...@apache.org
Subject [2/2] ambari git commit: AMBARI-20397 Zeppelin: Spark2 and Livy2 interpreter config disappear during stack upgrade (r-kamath)
Date Tue, 14 Mar 2017 09:07:42 GMT
AMBARI-20397 Zeppelin: Spark2 and Livy2 interpreter config disappear during stack upgrade (r-kamath)


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

Branch: refs/heads/trunk
Commit: 645407b65558110a5fa6306c034d73c09ba2bfe6
Parents: efd3b58
Author: Renjith Kamath <renjith.kamath@gmail.com>
Authored: Tue Mar 14 14:36:12 2017 +0530
Committer: Renjith Kamath <renjith.kamath@gmail.com>
Committed: Tue Mar 14 14:37:15 2017 +0530

----------------------------------------------------------------------
 .../common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/645407b6/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 a460aec..38bfeb4 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
@@ -309,12 +309,12 @@ class Master(Script):
     config_data = self.get_interpreter_settings()
     interpreter_settings = config_data['interpreterSettings']
 
-    if 'spark2-env' in params.config['configurations']:
+    if 'spark2-defaults' in params.config['configurations']:
       spark2_config = self.get_spark2_interpreter_config()
       config_id = spark2_config["id"]
       interpreter_settings[config_id] = spark2_config
 
-    if 'livy2-env' in params.config['configurations']:
+    if 'livy2-defaults' in params.config['configurations']:
       livy2_config = self.get_livy2_interpreter_config()
       config_id = livy2_config["id"]
       interpreter_settings[config_id] = livy2_config


Mime
View raw message