Author: tomwhite
Date: Wed Oct 6 03:47:45 2010
New Revision: 1004887
URL: http://svn.apache.org/viewvc?rev=1004887&view=rev
Log:
Merge -r 1004885:1004886 from trunk to branch. Fixes: MAPREDUCE-2040
Added:
hadoop/mapreduce/branches/branch-0.21/src/docs/src/documentation/content/xdocs/dynamic_scheduler.xml
- copied unchanged from r1004886, hadoop/mapreduce/trunk/src/docs/src/documentation/content/xdocs/dynamic_scheduler.xml
Modified:
hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
hadoop/mapreduce/branches/branch-0.21/src/docs/src/documentation/content/xdocs/site.xml
Modified: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/CHANGES.txt?rev=1004887&r1=1004886&r2=1004887&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.21/CHANGES.txt Wed Oct 6 03:47:45 2010
@@ -2,6 +2,11 @@ Hadoop MapReduce Change Log
Release 0.21.1 - Unreleased
+ NEW FEATURES
+
+ MAPREDUCE-2040. Forrest Documentation for Dynamic Priority Scheduler.
+ (Thomas Sandholm via tomwhite)
+
BUG FIXES
MAPREDUCE-1897. trunk build broken on compile-mapred-test (cos)
Modified: hadoop/mapreduce/branches/branch-0.21/src/docs/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/docs/src/documentation/content/xdocs/site.xml?rev=1004887&r1=1004886&r2=1004887&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/docs/src/documentation/content/xdocs/site.xml
(original)
+++ hadoop/mapreduce/branches/branch-0.21/src/docs/src/documentation/content/xdocs/site.xml
Wed Oct 6 03:47:45 2010
@@ -48,6 +48,7 @@ See http://forrest.apache.org/docs/linki
<docs label="Schedulers">
<cap_scheduler label="Capacity Scheduler" href="capacity_scheduler.html"/>
<fair_scheduler label="Fair Scheduler" href="fair_scheduler.html"/>
+ <dyn_scheduler label="Dynamic Priority Scheduler" href="dynamic_scheduler.html"/>
</docs>
<docs label="Miscellaneous">
|