Repository: ambari Updated Branches: refs/heads/branch-2.5 a6c12bfc3 -> 1b0212c72
AMBARI-18430. Microsoft-R service should be supported on SLES11. (Balazs Bence Sari via stoader) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1b0212c7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1b0212c7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1b0212c7 Branch: refs/heads/branch-2.5 Commit: 1b0212c72c1c710b1b1cf77855e4ecd766b7537d Parents: a6c12bf Author: Balazs Bence Sari <bs...@hortonworks.com> Authored: Mon Sep 26 13:28:55 2016 +0200 Committer: Toader, Sebastian <stoa...@hortonworks.com> Committed: Mon Sep 26 13:31:31 2016 +0200 ---------------------------------------------------------------------- .../8.0.0/configuration/microsoft-r-env.xml | 35 -------------------- .../MICROSOFT_R/8.0.0/repos/repoinfo.xml | 6 ++-- .../src/main/resources/mpack.json | 10 +----- 3 files changed, 4 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1b0212c7/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/configuration/microsoft-r-env.xml ---------------------------------------------------------------------- diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/configuration/microsoft-r-env.xml b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/configuration/microsoft-r-env.xml deleted file mode 100644 index 5bc4a31..0000000 --- a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/configuration/microsoft-r-env.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> -<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> -<!-- -/** - * 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. - */ ---> -<!-- This is a special config file for properties used to monitor status of the service --> -<configuration supports_adding_forbidden="true"> - <property> - <name>R Open Version</name> - <display-name>Version of R Open</display-name> - <description>Version of R Open</description> - <value>3.2.2</value> - <value-attributes> - <type>string</type> - <overridable>false</overridable> - </value-attributes> - <on-ambari-upgrade add="true"/> - </property> -</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1b0212c7/contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.0/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.0/repos/repoinfo.xml b/contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.0/repos/repoinfo.xml index 4c82514..687643b 100644 --- a/contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.0/repos/repoinfo.xml +++ b/contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.0/repos/repoinfo.xml @@ -18,14 +18,14 @@ <reposinfo> <os family="redhat6"> <repo> - <baseurl>http://104.196.87.250/msft-r/MICROSOFT_R-8.0/</baseurl> + <baseurl>http://PLEASE_ENTER_REPO_URL</baseurl> <repoid>MSFT_R-8.1</repoid> <reponame>MSFT_R</reponame> </repo> </os> - <os family="redhat5"> + <os family="suse11"> <repo> - <baseurl>http://104.196.87.250/msft-r/MICROSOFT_R-8.0/</baseurl> + <baseurl>http://PLEASE_ENTER_REPO_URL</baseurl> <repoid>MSFT_R-8.1</repoid> <reponame>MSFT_R</reponame> </repo> http://git-wip-us.apache.org/repos/asf/ambari/blob/1b0212c7/contrib/management-packs/microsoft-r_mpack/src/main/resources/mpack.json ---------------------------------------------------------------------- diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/mpack.json b/contrib/management-packs/microsoft-r_mpack/src/main/resources/mpack.json index f90ccce..52363d1 100644 --- a/contrib/management-packs/microsoft-r_mpack/src/main/resources/mpack.json +++ b/contrib/management-packs/microsoft-r_mpack/src/main/resources/mpack.json @@ -37,15 +37,7 @@ }, { "stack_name" : "HDP", - "stack_version" : "2.1" - }, - { - "stack_name" : "HDP", - "stack_version" : "2.2" - }, - { - "stack_name" : "HDP", - "stack_version" : "2.3" + "stack_version" : "2.0.6" } ] }
