Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-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 CBCD718A5E for ; Wed, 13 Jan 2016 22:29:34 +0000 (UTC) Received: (qmail 90134 invoked by uid 500); 13 Jan 2016 22:29:30 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 89749 invoked by uid 500); 13 Jan 2016 22:29:30 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 89387 invoked by uid 99); 13 Jan 2016 22:29:30 -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; Wed, 13 Jan 2016 22:29:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 10365E384F; Wed, 13 Jan 2016 22:29:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vinodkv@apache.org To: common-commits@hadoop.apache.org Date: Wed, 13 Jan 2016 22:29:42 -0000 Message-Id: <1d516c2f6a184131b30b1dbba3f87f4d@git.apache.org> In-Reply-To: <2414eaa6fba348e79eca40d328eb1373@git.apache.org> References: <2414eaa6fba348e79eca40d328eb1373@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/17] hadoop git commit: YARN-4241. Fix typo of property name in yarn-default.xml. Contributed by Anthony Rojas. YARN-4241. Fix typo of property name in yarn-default.xml. Contributed by Anthony Rojas. (cherry picked from commit 23d0db551cc63def9acbab2473e58fb1c52f85e0) (cherry picked from commit f6f128c8676981a33ccc55c92321244391f9a3ac) (cherry picked from commit 0bdb51d8010a8329da332610f5197565185423bf) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c3ba72c8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c3ba72c8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c3ba72c8 Branch: refs/heads/branch-2.7.2 Commit: c3ba72c870cb22194861f7f68810b65c920bc8e6 Parents: 096ac9e Author: Akira Ajisaka Authored: Wed Nov 11 16:13:08 2015 +0900 Committer: Vinod Kumar Vavilapalli (I am also known as @tshooter.) Committed: Wed Jan 13 11:48:15 2016 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../hadoop-yarn-common/src/main/resources/yarn-default.xml | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c3ba72c8/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 23d5d0a..d7e2abe 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -894,6 +894,9 @@ Release 2.6.3 - UNRELEASED YARN-2859. ApplicationHistoryServer binds to default port 8188 in MiniYARNCluster. (Vinod Kumar Vavilapalli via xgong) + YARN-4241. Fix typo of property name in yarn-default.xml. + (Anthony Rojas via aajisaka) + Release 2.6.2 - 2015-10-28 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/c3ba72c8/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml index eb72c9d..efd6a90 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml @@ -1020,7 +1020,7 @@ The minimum fraction of number of disks to be healthy for the nodemanager to launch new containers. This correspond to both - yarn-nodemanager.local-dirs and yarn.nodemanager.log-dirs. i.e. If there + yarn.nodemanager.local-dirs and yarn.nodemanager.log-dirs. i.e. If there are less number of healthy local-dirs (or log-dirs) available, then new containers will not be launched on this node. yarn.nodemanager.disk-health-checker.min-healthy-disks @@ -1031,7 +1031,7 @@ The maximum percentage of disk space utilization allowed after which a disk is marked as bad. Values can range from 0.0 to 100.0. If the value is greater than or equal to 100, the nodemanager will check - for full disk. This applies to yarn-nodemanager.local-dirs and + for full disk. This applies to yarn.nodemanager.local-dirs and yarn.nodemanager.log-dirs. yarn.nodemanager.disk-health-checker.max-disk-utilization-per-disk-percentage 90.0 @@ -1039,7 +1039,7 @@ The minimum space that must be available on a disk for - it to be used. This applies to yarn-nodemanager.local-dirs and + it to be used. This applies to yarn.nodemanager.local-dirs and yarn.nodemanager.log-dirs. yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb 0