Return-Path: 
 <commits-return-10652-apmail-ambari-commits-archive=ambari.apache.org@ambari.apache.org>
X-Original-To: apmail-ambari-commits-archive@www.apache.org
Delivered-To: apmail-ambari-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3ECD911CA9
	for <apmail-ambari-commits-archive@www.apache.org>;
 Wed, 17 Sep 2014 12:33:53 +0000 (UTC)
Received: (qmail 392 invoked by uid 500); 17 Sep 2014 12:33:53 -0000
Delivered-To: apmail-ambari-commits-archive@ambari.apache.org
Received: (qmail 347 invoked by uid 500); 17 Sep 2014 12:33:53 -0000
Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ambari.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ambari.apache.org>
List-Post: <mailto:commits@ambari.apache.org>
List-Id: <commits.ambari.apache.org>
Reply-To: ambari-dev@ambari.apache.org
Delivered-To: mailing list commits@ambari.apache.org
Received: (qmail 266 invoked by uid 99); 17 Sep 2014 12:33:53 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Sep 2014 12:33:53 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id CA2EFA1843A; Wed, 17 Sep 2014 12:33:52 +0000 (UTC)
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:07 -0000
Message-Id: <0f34913df5b6403a8695ede83d92a42a@git.apache.org>
In-Reply-To: <8271c6fa6fda4cf689b455e0ec498057@git.apache.org>
References: <8271c6fa6fda4cf689b455e0ec498057@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [17/29] git commit: AMBARI-7225 deploy of 2.1.GlusterFS stack errors
 with: org.apache.ambari.server.controller.spi.SystemException: An internal
 system exception occurred: Configuration with tag 'version1' exists for
 'core-site' (Scott Creeley via eboyd)

AMBARI-7225 deploy of 2.1.GlusterFS stack errors with:  org.apache.ambari.server.controller.spi.SystemException: An internal system exception occurred: Configuration with tag 'version1' exists for 'core-site'
(Scott Creeley via eboyd)


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

Branch: refs/heads/branch-alerts-dev
Commit: b1336f395a93549b8e0591ff1e67a924aef6cfba
Parents: ceee5bf
Author: Erin A Boyd <eboyd@redhat.com>
Authored: Tue Sep 16 14:42:35 2014 -0400
Committer: root <root@ambari.rhs>
Committed: Tue Sep 16 14:43:40 2014 -0400

----------------------------------------------------------------------
 .../GLUSTERFS/configuration/hadoop-env.xml      |  2 ++
 .../services/YARN/configuration/core-site.xml   | 20 --------------------
 2 files changed, 2 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b1336f39/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
index 6b00199..6c6d4c1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
@@ -81,11 +81,13 @@
     <value>hdfs</value>
     <description>User to run HDFS as</description>
   </property>
+  <!--
   <property>
     <name>user_group</name>
     <value>hadoop</value>
     <description>Proxy user group.</description>
   </property>
+  -->
     <!-- hadoop-env.sh -->
   <property>
     <name>content</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/b1336f39/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/core-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/core-site.xml
deleted file mode 100644
index 60f01ad..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/core-site.xml
+++ /dev/null
@@ -1,20 +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.
--->
-<configuration supports_final="true">
-</configuration>