From e422a2229753d956f75aa4e4cf3e5df6ebee4d61 Mon Sep 17 00:00:00 2001 From: Aaron Myers Date: Wed, 8 May 2013 17:18:59 +0000 Subject: [PATCH] YARN-646. Fix two typos in Fair Scheduler user guide. Contributed by Dapeng Sun. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480361 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-yarn-project/CHANGES.txt | 2 ++ .../hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index c13704dca1a..1064a2332a3 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -276,6 +276,8 @@ Release 2.0.5-beta - UNRELEASED YARN-576. Modified ResourceManager to reject NodeManagers that don't satisy minimum resource requirements. (Kenji Kikushima via vinodkv) + YARN-646. Fix two typos in Fair Scheduler user guide. (Dapeng Sun via atm) + Release 2.0.4-alpha - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm index c7a8229d36f..3d6af1347ec 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm @@ -124,7 +124,7 @@ Hadoop MapReduce Next Generation - Fair Scheduler * The smallest container size the scheduler can allocate, in MB of memory. - * <<>> + * <<>> * The largest container the scheduler can allocate, in MB of memory. @@ -177,7 +177,7 @@ Hadoop MapReduce Next Generation - Fair Scheduler Allocation file format - The allocation file must be in XML format. The format contains three types of + The allocation file must be in XML format. The format contains four types of elements: * <>, which represent queues. Each may contain the following