Home Explore Help
Register Sign In
apache
/
hadoop
mirror of https://github.com/apache/hadoop.git
2
0
Fork 1
Files Issues 0 Wiki
Browse Source

svn merge -c 1399786 from branch-1 for HADOOP-8823. ant package target should not depend on cn-docs.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.0@1399791 13f79535-47bb-0310-9956-ffa450edef68
Tsz-wo Sze 12 years ago
parent
024d6e690b
commit
a8ef92c1a6
2 changed files with 3 additions and 1 deletions
Unified View Show Diff Stats
  1. 2 0
      CHANGES.txt
  2. 1 1
      build.xml

+ 2 - 0
CHANGES.txt
View File 

@@ -12,6 +12,8 @@ Release 1.0.4 - 2012.10.02
 
     MAPREDUCE-4399. Change the Jetty response buffer size to improve 
     MAPREDUCE-4399. Change the Jetty response buffer size to improve 
     shuffle performance. (Luke Lu via suresh)
 
     shuffle performance. (Luke Lu via suresh)
 
 
 
+    HADOOP-8823. ant package target should not depend on cn-docs. (szetszwo)
 
+
 
   BUG FIXES
 
   BUG FIXES
 
 
 
     HDFS-3652. FSEditLog failure removes the wrong edit stream when storage
 
     HDFS-3652. FSEditLog failure removes the wrong edit stream when storage

+ 1 - 1
build.xml
View File 

@@ -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">
 
 	  description="assembles multi-platform artifacts for distribution">
 
     <delete dir="${dist.dir}"/>
 
     <delete dir="${dist.dir}"/>
 
     <mkdir dir="${dist.dir}"/>
 
     <mkdir dir="${dist.dir}"/>