Author: tgraves Date: Tue Jun 19 16:19:16 2012 New Revision: 1351766 URL: http://svn.apache.org/viewvc?rev=1351766&view=rev Log: merge -r 1351763:1351764 from branch-2. FIXES: MAPREDUCE-4341
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/CapacityScheduler.apt.vm Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1351766&r1=1351765&r2=1351766&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Tue Jun 19 16:19:16 2012 @@ -234,6 +234,9 @@ Release 0.23.3 - UNRELEASED MAPREDUCE-4311. Capacity scheduler.xml does not accept decimal values for capacity and maximum-capacity settings (Karthik Kambatla via tgraves) + MAPREDUCE-4341. add types to capacity scheduler properties documentation + (Karthik Kambatla via tgraves) + Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/CapacityScheduler.apt.vm URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/CapacityScheduler.apt.vm?rev=1351766&r1=1351765&r2=1351766&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/CapacityScheduler.apt.vm (original) +++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/CapacityScheduler.apt.vm Tue Jun 19 16:19:16 2012 @@ -197,14 +197,14 @@ Hadoop MapReduce Next Generation - Capac || Property || Description | *--------------------------------------+--------------------------------------+ | <<<yarn.scheduler.capacity.<queue-path>.capacity>>> | | -| | Queue <capacity> in percentage (%). | +| | Queue <capacity> in percentage (%) as a float (e.g. 12.5).| | | The sum of capacities for all queues, at each level, must be equal | | | to 100. | | | Applications in the queue may consume more resources than the queue's | | | capacity if there are free resources, providing elasticity. | *--------------------------------------+--------------------------------------+ | <<<yarn.scheduler.capacity.<queue-path>.maximum-capacity>>> | | -| | Maximum queue capacity in percentage (%). | +| | Maximum queue capacity in percentage (%) as a float. | | | This limits the <elasticity> for applications in the queue. | | | Defaults to -1 which disables it. | *--------------------------------------+--------------------------------------+