Author: atm
Date: Wed May 8 17:18:59 2013
New Revision: 1480361
URL: http://svn.apache.org/r1480361
Log:
YARN-646. Fix two typos in Fair Scheduler user guide. Contributed by Dapeng Sun.
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1480361&r1=1480360&r2=1480361&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Wed May 8
17:18:59 2013
@@ -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
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm?rev=1480361&r1=1480360&r2=1480361&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
(original)
+++
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
Wed May 8 17:18:59 2013
@@ -124,7 +124,7 @@ Hadoop MapReduce Next Generation - Fair
* The smallest container size the scheduler can allocate, in MB of memory.
- * <<<yarn.scheduler.fair.minimum-allocation-mb>>>
+ * <<<yarn.scheduler.fair.maximum-allocation-mb>>>
* The largest container the scheduler can allocate, in MB of memory.
@@ -177,7 +177,7 @@ Hadoop MapReduce Next Generation - Fair
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:
* <<Queue elements>>, which represent queues. Each may contain the following
