Repository: hadoop Updated Branches: refs/heads/branch-2.6 f55e1a4f3 -> 6c178cc32
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) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6c178cc3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6c178cc3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6c178cc3 Branch: refs/heads/branch-2.6 Commit: 6c178cc321f6416d204abe692e8348f168351013 Parents: f55e1a4 Author: Akira Ajisaka <[email protected]> Authored: Wed Nov 11 16:13:08 2015 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Wed Nov 11 16:18:18 2015 +0900 ---------------------------------------------------------------------- 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/6c178cc3/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 3032e19..7b1f03f 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -24,6 +24,9 @@ Release 2.6.3 - UNRELEASED YARN-4326. Fix TestDistributedShell timeout as AHS in MiniYarnCluster no longer binds to default port 8188. (Meng Ding via wangda) + 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/6c178cc3/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 e794339..e83f56c 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 @@ -977,7 +977,7 @@ <property> <description>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.</description> <name>yarn.nodemanager.disk-health-checker.min-healthy-disks</name> @@ -988,7 +988,7 @@ <description>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.</description> <name>yarn.nodemanager.disk-health-checker.max-disk-utilization-per-disk-percentage</name> <value>90.0</value> @@ -996,7 +996,7 @@ <property> <description>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.</description> <name>yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb</name> <value>0</value>
