You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2015/11/16 02:26:42 UTC

ambari git commit: AMBARI-13830. Bump Spark definition to 1.5.2 in Ambari (Saisai Shao via smohanty)

Repository: ambari
Updated Branches:
  refs/heads/trunk 15cc90c0e -> 66e90bcfa


AMBARI-13830. Bump Spark definition to 1.5.2 in Ambari (Saisai Shao via smohanty)


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

Branch: refs/heads/trunk
Commit: 66e90bcfa5a8298bf617973f3fa43fabd30ca32a
Parents: 15cc90c
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Sun Nov 15 17:26:09 2015 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Sun Nov 15 17:26:09 2015 -0800

----------------------------------------------------------------------
 .../SPARK/1.5.1.2.3/metainfo.xml                | 50 --------------------
 .../stacks/HDP/2.3/services/SPARK/metainfo.xml  |  2 +-
 2 files changed, 1 insertion(+), 51 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/66e90bcf/ambari-server/src/main/resources/common-services/SPARK/1.5.1.2.3/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.5.1.2.3/metainfo.xml b/ambari-server/src/main/resources/common-services/SPARK/1.5.1.2.3/metainfo.xml
deleted file mode 100644
index 190d892..0000000
--- a/ambari-server/src/main/resources/common-services/SPARK/1.5.1.2.3/metainfo.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements.  See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership.  The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>SPARK</name>
-      <extends>common-services/SPARK/1.4.1.2.3</extends>
-      <displayName>Spark</displayName>
-      <comment>Apache Spark is a fast and general engine for large-scale data processing.</comment>
-      <version>1.5.1.2.3</version>
-      <!-- No new components added for 1.5.1 -->
-      <configuration-dependencies>
-        <config-type>spark-defaults</config-type>
-        <config-type>spark-env</config-type>
-        <config-type>spark-log4j-properties</config-type>
-        <config-type>spark-metrics-properties</config-type>
-        <config-type>spark-javaopts-properties</config-type>
-        <config-type>spark-thrift-sparkconf</config-type>
-        <config-type>spark-hive-site-override</config-type>
-      </configuration-dependencies>
-
-      <commandScript>
-        <script>scripts/service_check.py</script>
-        <scriptType>PYTHON</scriptType>
-        <timeout>300</timeout>
-      </commandScript>
-
-      <requiredServices>
-        <service>YARN</service>
-      </requiredServices>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/66e90bcf/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/metainfo.xml
index 0e20794..d86afdf 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/metainfo.xml
@@ -23,7 +23,7 @@
     <services>
         <service>
           <name>SPARK</name>
-          <version>1.5.1.2.3</version>
+          <version>1.5.2.2.3</version>
           <extends>common-services/SPARK/1.4.1.2.3</extends>
           <osSpecifics>
             <osSpecific>