Repository: ambari Updated Branches: refs/heads/trunk ceee5bfed -> b1336f395
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/trunk Commit: b1336f395a93549b8e0591ff1e67a924aef6cfba Parents: ceee5bf Author: Erin A Boyd <eb...@redhat.com> Authored: Tue Sep 16 14:42:35 2014 -0400 Committer: root <r...@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>