Author: acmurthy
Date: Fri Dec 19 16:06:05 2008
New Revision: 728190
URL: http://svn.apache.org/viewvc?rev=728190&view=rev
Log:
Merge -r 728186:728187 from trunk to branch-0.20 to fix HADOOP-4849.
Added:
hadoop/core/branches/branch-0.20/src/docs/src/documentation/content/xdocs/service_level_auth.xml
- copied unchanged from r728187,
hadoop/core/trunk/src/docs/src/documentation/content/xdocs/service_level_auth.xml
Modified:
hadoop/core/branches/branch-0.20/ (props changed)
hadoop/core/branches/branch-0.20/CHANGES.txt (contents, props changed)
hadoop/core/branches/branch-0.20/src/docs/src/documentation/content/xdocs/site.xml
Propchange: hadoop/core/branches/branch-0.20/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 16:06:05 2008
@@ -1,2 +1,2 @@
/hadoop/core/branches/branch-0.19:713112
-/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187
Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=728190&r1=728189&r2=728190&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Fri Dec 19 16:06:05 2008
@@ -463,6 +463,9 @@
HADOOP-4876. Fix capacity scheduler reclamation by updating count of
pending tasks correctly. (Sreekanth Ramakrishnan via yhemanth)
+ HADOOP-4849. Documentation for Service Level Authorization implemented in
+ HADOOP-4348. (acmurthy)
+
Release 0.19.1 - Unreleased
IMPROVEMENTS
Propchange: hadoop/core/branches/branch-0.20/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 16:06:05 2008
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
-/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869
+/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187
Modified:
hadoop/core/branches/branch-0.20/src/docs/src/documentation/content/xdocs/site.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/docs/src/documentation/content/xdocs/site.xml?rev=728190&r1=728189&r2=728190&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.20/src/docs/src/documentation/content/xdocs/site.xml
(original)
+++
hadoop/core/branches/branch-0.20/src/docs/src/documentation/content/xdocs/site.xml
Fri Dec 19 16:06:05 2008
@@ -52,6 +52,7 @@
<hod-admin-guide label="HOD Admin Guide" href="hod_admin_guide.html"/>
<hod-config-guide label="HOD Config Guide" href="hod_config_guide.html"/>
<capacity_scheduler label="Capacity Scheduler"
href="capacity_scheduler.html"/>
+ <service_level_auth label="Service Level Authorization"
href="service_level_auth.html"/>
<vaidya label="Hadoop Vaidya" href="vaidya.html"/>
<api label="API Docs" href="ext:api/index" />
<jdiff label="API Changes" href="ext:jdiff/changes" />
