Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ambari-dev@ambari.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: jonathanhurley@apache.org
To: commits@ambari.apache.org
Date: Wed, 17 Sep 2014 12:34:06 -0000
Message-Id: <e5f66f92f8bf4bbf8a243a862ace0de7@git.apache.org>
In-Reply-To: <8271c6fa6fda4cf689b455e0ec498057@git.apache.org>
References: <8271c6fa6fda4cf689b455e0ec498057@git.apache.org>
Subject: [16/29] git commit: AMBARI-7340. Webhcat and hcat services are shown
 in 2.0 stack as separate (aonishuk)

AMBARI-7340. Webhcat and hcat services are shown in 2.0 stack as separate (aonishuk)


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

Branch: refs/heads/branch-alerts-dev
Commit: db62322f4b16be65ea59577e43a3740c5b408199
Parents: 246ae72
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Tue Sep 16 21:39:20 2014 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Tue Sep 16 21:39:20 2014 +0300

----------------------------------------------------------------------
 .../stacks/HDP/2.0/role_command_order.json      |  2 +-
 .../stacks/HDP/2.0/services/HIVE/metainfo.xml   |  4 ---
 .../HDP/2.0/services/WEBHCAT/metainfo.xml       | 26 --------------------
 3 files changed, 1 insertion(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/db62322f/ambari-server/src/main/resources/stacks/HDP/2.0/role_command_order.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0/role_command_order.json b/ambari-server/src/main/resources/stacks/HDP/2.0/role_command_order.json
index e90617e..9c5db5c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0/role_command_order.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0/role_command_order.json
@@ -23,7 +23,7 @@
     "OOZIE_SERVICE_CHECK-SERVICE_CHECK": ["OOZIE_SERVER-START", "MAPREDUCE2_SERVICE_CHECK-SERVICE_CHECK"],
     "WEBHCAT_SERVICE_CHECK-SERVICE_CHECK": ["WEBHCAT_SERVER-START"],
     "HBASE_SERVICE_CHECK-SERVICE_CHECK": ["HBASE_MASTER-START", "HBASE_REGIONSERVER-START"],
-    "HIVE_SERVICE_CHECK-SERVICE_CHECK": ["HIVE_SERVER-START", "HIVE_METASTORE-START"],
+    "HIVE_SERVICE_CHECK-SERVICE_CHECK": ["HIVE_SERVER-START", "HIVE_METASTORE-START", "WEBHCAT_SERVER-START"],
     "HCAT_SERVICE_CHECK-SERVICE_CHECK": ["HIVE_SERVER-START"],
     "PIG_SERVICE_CHECK-SERVICE_CHECK": ["RESOURCEMANAGER-START", "NODEMANAGER-START"],
     "SQOOP_SERVICE_CHECK-SERVICE_CHECK": ["RESOURCEMANAGER-START", "NODEMANAGER-START"],

http://git-wip-us.apache.org/repos/asf/ambari/blob/db62322f/ambari-server/src/main/resources/stacks/HDP/2.0/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0/services/HIVE/metainfo.xml
index bed0ee4..b24dada 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0/services/HIVE/metainfo.xml
@@ -22,9 +22,5 @@
       <name>HIVE</name>
       <version>0.12.0.2.0</version>
     </service>
-    <service>
-      <name>HCATALOG</name>
-      <version>0.12.0.2.0</version>
-    </service>
   </services>
 </metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/db62322f/ambari-server/src/main/resources/stacks/HDP/2.0/services/WEBHCAT/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0/services/WEBHCAT/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0/services/WEBHCAT/metainfo.xml
deleted file mode 100644
index 89c52c0..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.0/services/WEBHCAT/metainfo.xml
+++ /dev/null
@@ -1,26 +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>WEBHCAT</name>
-      <version>0.12.0.2.0</version>
-    </service>
-  </services>
-</metainfo>