Author: sandy
Date: Mon Aug 26 20:49:02 2013
New Revision: 1517693
URL: http://svn.apache.org/r1517693
Log:
YARN-942. In Fair Scheduler documentation, inconsistency on which properties
have prefix (Akira Ajisaka via Sandy Ryza)
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/CHANGES.txt?rev=1517693&r1=1517692&r2=1517693&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/CHANGES.txt Mon
Aug 26 20:49:02 2013
@@ -16,6 +16,9 @@ Release 2.1.1-beta - UNRELEASED
YARN-1093. Corrections to Fair Scheduler documentation (Wing Yew Poon via
Sandy Ryza)
+ YARN-942. In Fair Scheduler documentation, inconsistency on which
+ properties have prefix (Akira Ajisaka via Sandy Ryza)
+
OPTIMIZATIONS
BUG FIXES
Modified:
hadoop/common/branches/branch-2.1-beta/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.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm?rev=1517693&r1=1517692&r2=1517693&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
Mon Aug 26 20:49:02 2013
@@ -159,7 +159,7 @@ Hadoop MapReduce Next Generation - Fair
* If assignmultiple is true, the maximum amount of containers that can be
assigned in one heartbeat. Defaults to -1, which sets no limit.
- * <<<locality.threshold.node>>>
+ * <<<yarn.scheduler.fair.locality.threshold.node>>>
* For applications that request containers on particular nodes, the number
of
scheduling opportunities since the last container assignment to wait
before
@@ -168,7 +168,7 @@ Hadoop MapReduce Next Generation - Fair
opportunities to pass up. The default value of -1.0 means don't pass up
any
scheduling opportunities.
- * <<<locality.threshold.rack>>>
+ * <<<yarn.scheduler.fair.locality.threshold.rack>>>
* For applications that request containers on particular racks, the number
of
scheduling opportunities since the last container assignment to wait
before
