hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ama...@apache.org
Subject svn commit: r1204885 - in /hadoop/common/trunk/hadoop-mapreduce-project: CHANGES.txt build.xml src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
Date Tue, 22 Nov 2011 09:52:51 GMT
Author: amarrk
Date: Tue Nov 22 09:52:50 2011
New Revision: 1204885

URL: http://svn.apache.org/viewvc?rev=1204885&view=rev
Log:
 MAPREDUCE-3412. Fix 'ant docs'. (amarrk)

Modified:
    hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
    hadoop/common/trunk/hadoop-mapreduce-project/build.xml
    hadoop/common/trunk/hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1204885&r1=1204884&r2=1204885&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Tue Nov 22 09:52:50 2011
@@ -41,6 +41,8 @@ Trunk (unreleased changes)
     (tucu)
 
   BUG FIXES
+    MAPREDUCE-3412. Fix 'ant docs'. (amarrk)
+
     MAPREDUCE-3346. [Rumen] LoggedTaskAttempt#getHostName() returns null. 
                     (amarrk)
 

Modified: hadoop/common/trunk/hadoop-mapreduce-project/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/build.xml?rev=1204885&r1=1204884&r2=1204885&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/build.xml (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/build.xml Tue Nov 22 09:52:50 2011
@@ -932,10 +932,6 @@
     <style basedir="${mapred.src.dir}" destdir="${build.docs}"
            includes="mapred-default.xml" style="conf/configuration.xsl"/>
     <antcall target="changes-to-html"/>
-    <subant target="docs">
-       <property name="build.docs" value="${build.docs}"/>
-       <fileset file="${contrib.dir}/build.xml"/>
-    </subant> 
   </target>
 
   <target name="javadoc-dev" depends="compile, ivy-retrieve-javadoc" description="Generate
javadoc for hadoop developers">

Modified: hadoop/common/trunk/hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml?rev=1204885&r1=1204884&r2=1204885&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
(original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
Tue Nov 22 09:52:50 2011
@@ -2060,9 +2060,7 @@
           <p>Hadoop comes configured with a single mandatory queue, called 
           'default'. Queue names are defined in the 
           <code>mapred.queue.names</code> property of the Hadoop site
-          configuration. Some job schedulers, such as the 
-          <a href="capacity_scheduler.html">Capacity Scheduler</a>, 
-          support multiple queues.</p>
+          configuration.</p>
           
           <p>A job defines the queue it needs to be submitted to through the
           <code>mapreduce.job.queuename</code> property.



Mime
View raw message