Return-Path: 
 <commits-return-20009-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 DBC4510871
	for <apmail-ambari-commits-archive@www.apache.org>;
 Tue,  8 Sep 2015 18:03:54 +0000 (UTC)
Received: (qmail 92257 invoked by uid 500); 8 Sep 2015 18:03:51 -0000
Delivered-To: apmail-ambari-commits-archive@ambari.apache.org
Received: (qmail 92228 invoked by uid 500); 8 Sep 2015 18:03:51 -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 92216 invoked by uid 99); 8 Sep 2015 18:03:51 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Sep 2015 18:03:51 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 7A938DFC92; Tue,  8 Sep 2015 18:03:51 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: alejandro@apache.org
To: commits@ambari.apache.org
Message-Id: <489e990fba6f49d484081bfc5fa78816@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: ambari git commit: AMBARI-11740. Duplicated property
 dfs.heartbeat.interval on hdfs-site (Juanjo Marron via alejandro)
Date: Tue,  8 Sep 2015 18:03:51 +0000 (UTC)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 8f4513819 -> b018ed447


AMBARI-11740. Duplicated property dfs.heartbeat.interval on hdfs-site (Juanjo Marron via alejandro)


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

Branch: refs/heads/branch-2.1
Commit: b018ed4478ff3d9c64e5bba9885122c33e156b2e
Parents: 8f45138
Author: Alejandro Fernandez <afernandez@hortonworks.com>
Authored: Tue Sep 8 11:02:28 2015 -0700
Committer: Alejandro Fernandez <afernandez@hortonworks.com>
Committed: Tue Sep 8 11:02:28 2015 -0700

----------------------------------------------------------------------
 .../common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml | 6 ------
 .../BIGTOP/0.8/services/HDFS/configuration/hdfs-site.xml       | 6 ------
 .../2.0.6.GlusterFS/services/HDFS/configuration/hdfs-site.xml  | 6 ------
 3 files changed, 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b018ed44/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
index d8fff68..dc7f661 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
@@ -160,12 +160,6 @@
   </property>
 
   <property>
-    <name>dfs.heartbeat.interval</name>
-    <value>3</value>
-    <description>Determines datanode heartbeat interval in seconds.</description>
-  </property>
-
-  <property>
     <name>dfs.namenode.safemode.threshold-pct</name>
     <value>0.999</value>
     <description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/b018ed44/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-site.xml
index 6499868..bb5c76d 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-site.xml
@@ -147,12 +147,6 @@
   </property>
 
   <property>
-    <name>dfs.heartbeat.interval</name>
-    <value>3</value>
-    <description>Determines datanode heartbeat interval in seconds.</description>
-  </property>
-
-  <property>
     <name>dfs.namenode.safemode.threshold-pct</name>
     <value>1.0f</value>
     <description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/b018ed44/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/hdfs-site.xml
index c11523a..e680c14 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/hdfs-site.xml
@@ -146,12 +146,6 @@
   </property>
 
   <property>
-    <name>dfs.heartbeat.interval</name>
-    <value>3</value>
-    <description>Determines datanode heartbeat interval in seconds.</description>
-  </property>
-
-  <property>
     <name>dfs.namenode.safemode.threshold-pct</name>
     <value>1.0f</value>
     <description>