Author: szetszwo
Date: Thu Oct 18 19:03:48 2012
New Revision: 1399791
URL: http://svn.apache.org/viewvc?rev=1399791&view=rev
Log:
svn merge -c 1399786 from branch-1 for HADOOP-8823. ant package target should
not depend on cn-docs.
Modified:
hadoop/common/branches/branch-1.0/ (props changed)
hadoop/common/branches/branch-1.0/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-1.0/build.xml
Propchange: hadoop/common/branches/branch-1.0/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1:r1399786
Modified: hadoop/common/branches/branch-1.0/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/CHANGES.txt?rev=1399791&r1=1399790&r2=1399791&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.0/CHANGES.txt Thu Oct 18 19:03:48 2012
@@ -12,6 +12,8 @@ Release 1.0.4 - 2012.10.02
MAPREDUCE-4399. Change the Jetty response buffer size to improve
shuffle performance. (Luke Lu via suresh)
+ HADOOP-8823. ant package target should not depend on cn-docs. (szetszwo)
+
BUG FIXES
HDFS-3652. FSEditLog failure removes the wrong edit stream when storage
Propchange: hadoop/common/branches/branch-1.0/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1/CHANGES.txt:r1399786
Modified: hadoop/common/branches/branch-1.0/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/build.xml?rev=1399791&r1=1399790&r2=1399791&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/build.xml (original)
+++ hadoop/common/branches/branch-1.0/build.xml Thu Oct 18 19:03:48 2012
@@ -1494,7 +1494,7 @@
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
- <target name="package" depends="compile, jar, javadoc, docs, cn-docs,
api-report, examples, tools-jar, jar-test, ant-tasks, package-librecordio"
+ <target name="package" depends="compile, jar, javadoc, docs, api-report,
examples, tools-jar, jar-test, ant-tasks, package-librecordio"
description="assembles multi-platform artifacts for distribution">
<delete dir="${dist.dir}"/>
<mkdir dir="${dist.dir}"/>
