diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 49bac687ab..206f9a17c5 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -584,6 +584,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 diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/CapacityScheduler.apt.vm b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/CapacityScheduler.apt.vm index 0ee8220425..01a9f60376 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/CapacityScheduler.apt.vm +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/CapacityScheduler.apt.vm @@ -197,14 +197,14 @@ Hadoop MapReduce Next Generation - Capacity Scheduler || Property || Description | *--------------------------------------+--------------------------------------+ | <<.capacity>>> | | -| | Queue in percentage (%). | +| | Queue 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. | *--------------------------------------+--------------------------------------+ | <<.maximum-capacity>>> | | -| | Maximum queue capacity in percentage (%). | +| | Maximum queue capacity in percentage (%) as a float. | | | This limits the for applications in the queue. | | | Defaults to -1 which disables it. | *--------------------------------------+--------------------------------------+