You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sz...@apache.org on 2012/10/20 01:40:38 UTC
svn commit: r1400341 - in /hadoop/common/branches/branch-1-win: ./
CHANGES.txt build.xml
Author: szetszwo
Date: Fri Oct 19 23:40:38 2012
New Revision: 1400341
URL: http://svn.apache.org/viewvc?rev=1400341&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-win/ (props changed)
hadoop/common/branches/branch-1-win/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-1-win/build.xml
Propchange: hadoop/common/branches/branch-1-win/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1:r1399786
Modified: hadoop/common/branches/branch-1-win/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.txt?rev=1400341&r1=1400340&r2=1400341&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1-win/CHANGES.txt Fri Oct 19 23:40:38 2012
@@ -17,7 +17,19 @@ Release 1.2.0 - unreleased
HADOOP-7827. jsp pages missing DOCTYPE tags. (Dave Vronay, Backport by
Ivan Mitic via suresh)
-Release 1.1.0 - unreleased
+Release 1.1.1 - Unreleased
+
+ INCOMPATIBLE CHANGES
+
+ NEW FEATURES
+
+ IMPROVEMENTS
+
+ HADOOP-8823. ant package target should not depend on cn-docs. (szetszwo)
+
+ BUG FIXES
+
+Release 1.1.0 - 2012.09.28
NEW FEATURES
Propchange: hadoop/common/branches/branch-1-win/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1/CHANGES.txt:r1399786
Modified: hadoop/common/branches/branch-1-win/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/build.xml?rev=1400341&r1=1400340&r2=1400341&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/build.xml (original)
+++ hadoop/common/branches/branch-1-win/build.xml Fri Oct 19 23:40:38 2012
@@ -1529,7 +1529,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}"/>