From e23022e096679485b868e198dd624d0a8d219cbc Mon Sep 17 00:00:00 2001 From: Vinod Kumar Vavilapalli Date: Sun, 23 Feb 2014 02:33:15 +0000 Subject: [PATCH] YARN-1742. Fixed javadoc of configuration parameter DEFAULT_NM_MIN_HEALTHY_DISKS_FRACTION. Contributed by Akira Ajisaka. svn merge --ignore-ancestry -c 1570956 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570957 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/yarn/conf/YarnConfiguration.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index eab191c6bfe..d93d26e8f04 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -324,6 +324,9 @@ Release 2.4.0 - UNRELEASED YARN-1071. Enabled ResourceManager to recover cluster metrics numDecommissionedNMs after restarting. (Jian He via zjshen) + YARN-1742. Fixed javadoc of configuration parameter + DEFAULT_NM_MIN_HEALTHY_DISKS_FRACTION. (Akira Ajisaka via vinodkv) + Release 2.3.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java index f2722a58499..04ecea6fe05 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java @@ -736,7 +736,7 @@ public class YarnConfiguration extends Configuration { public static final String NM_MIN_HEALTHY_DISKS_FRACTION = NM_PREFIX + "disk-health-checker.min-healthy-disks"; /** - * By default, at least 5% of disks are to be healthy to say that the node + * By default, at least 25% of disks are to be healthy to say that the node * is healthy in terms of disks. */ public static final float DEFAULT_NM_MIN_HEALTHY_DISKS_FRACTION