Repository: ambari Updated Branches: refs/heads/trunk 41b37c414 -> 40f0c056b
AMBARI-8083. Flume: Hide Flume log4j configurations (srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/40f0c056 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/40f0c056 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/40f0c056 Branch: refs/heads/trunk Commit: 40f0c056be356194960cd33d9f98596df13fb175 Parents: 41b37c4 Author: Srimanth Gunturi <sgunt...@hortonworks.com> Authored: Fri Oct 31 14:10:14 2014 -0700 Committer: Srimanth Gunturi <sgunt...@hortonworks.com> Committed: Fri Oct 31 15:01:00 2014 -0700 ---------------------------------------------------------------------- .../FLUME/configuration/flume-log4j.xml | 31 -------------------- .../HDP/2.0.6/services/FLUME/metainfo.xml | 1 - 2 files changed, 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/40f0c056/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-log4j.xml deleted file mode 100644 index 8c6ac27..0000000 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-log4j.xml +++ /dev/null @@ -1,31 +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="false"> - <property> - <name>content</name> - <description>Custom log4j.properties</description> - <value> -# Flume log4j config - </value> - </property> -</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/40f0c056/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml index 4f6bbd9..4282e9c 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/metainfo.xml @@ -61,7 +61,6 @@ <configuration-dependencies> <config-type>flume-env</config-type> <config-type>flume-conf</config-type> - <config-type>flume-log4j</config-type> </configuration-dependencies> </service>
