big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MAPREDUCE-3412. Fix 'ant docs'. (amarrk)

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1204885 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Amar Kamat 2011-11-22 09:52:50 +00:00
parent 49417594e8
commit e21c2ff5f1
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-mapreduce-project/CHANGES.txt
View File

@ -41,6 +41,8 @@ Trunk (unreleased changes)
(tucu) (tucu)
BUG FIXES BUG FIXES
MAPREDUCE-3412. Fix 'ant docs'. (amarrk)
MAPREDUCE-3346. [Rumen] LoggedTaskAttempt#getHostName() returns null. MAPREDUCE-3346. [Rumen] LoggedTaskAttempt#getHostName() returns null.
(amarrk) (amarrk)

4
hadoop-mapreduce-project/build.xml
View File

@ -932,10 +932,6 @@
<style basedir="${mapred.src.dir}" destdir="${build.docs}" <style basedir="${mapred.src.dir}" destdir="${build.docs}"
includes="mapred-default.xml" style="conf/configuration.xsl"/> includes="mapred-default.xml" style="conf/configuration.xsl"/>
<antcall target="changes-to-html"/> <antcall target="changes-to-html"/>
<subant target="docs">
<property name="build.docs" value="${build.docs}"/>
<fileset file="${contrib.dir}/build.xml"/>
</subant>
</target> </target>
<target name="javadoc-dev" depends="compile, ivy-retrieve-javadoc" description="Generate javadoc for hadoop developers"> <target name="javadoc-dev" depends="compile, ivy-retrieve-javadoc" description="Generate javadoc for hadoop developers">

4
hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
View File

@ -2060,9 +2060,7 @@
<p>Hadoop comes configured with a single mandatory queue, called <p>Hadoop comes configured with a single mandatory queue, called
'default'. Queue names are defined in the 'default'. Queue names are defined in the
<code>mapred.queue.names</code> property of the Hadoop site <code>mapred.queue.names</code> property of the Hadoop site
configuration. Some job schedulers, such as the configuration.</p>
<a href="capacity_scheduler.html">Capacity Scheduler</a>,
support multiple queues.</p>
<p>A job defines the queue it needs to be submitted to through the <p>A job defines the queue it needs to be submitted to through the
<code>mapreduce.job.queuename</code> property. <code>mapreduce.job.queuename</code> property.