You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by vi...@apache.org on 2012/02/06 22:05:11 UTC
svn commit: r1241181 - in
/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt
build.xml
Author: vinodkv
Date: Mon Feb 6 21:05:10 2012
New Revision: 1241181
URL: http://svn.apache.org/viewvc?rev=1241181&view=rev
Log:
MAPREDUCE-3814. Fixed MRV1 compilation. (Arun C Murthy via vinodkv)
svn merge --ignore-ancestry -c 1241177 ../../trunk/
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/build.xml
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1241181&r1=1241180&r2=1241181&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Mon Feb 6 21:05:10 2012
@@ -663,6 +663,8 @@ Release 0.23.1 - Unreleased
MAPREDUCE-3747. Initialize queue metrics upfront and added start/finish
time to RM Web-UI. (acmurthy)
+ MAPREDUCE-3814. Fixed MRV1 compilation. (Arun C Murthy via vinodkv)
+
Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/build.xml?rev=1241181&r1=1241180&r2=1241181&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/build.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/build.xml Mon Feb 6 21:05:10 2012
@@ -525,43 +525,11 @@
dest.dir="${test.mapred.build.classes}"
classpath="test.classpath"/>
- <javac
- encoding="${build.encoding}"
- srcdir="${test.src.dir}/mapred/testjar"
- includes="*.java"
- destdir="${test.mapred.build.testjar}"
- debug="${javac.debug}"
- optimize="${javac.optimize}"
- target="${javac.version}"
- source="${javac.version}"
- deprecation="${javac.deprecation}">
- <compilerarg line="${javac.args} ${javac.args.warnings}" />
- <classpath refid="test.classpath"/>
- </javac>
-
<delete file="${test.mapred.build.testjar}/testjob.jar"/>
<jar jarfile="${test.mapred.build.testjar}/testjob.jar"
basedir="${test.mapred.build.testjar}">
</jar>
- <javac
- encoding="${build.encoding}"
- srcdir="${test.src.dir}/mapred/testshell"
- includes="*.java"
- destdir="${test.mapred.build.testshell}"
- debug="${javac.debug}"
- optimize="${javac.optimize}"
- target="${javac.version}"
- source="${javac.version}"
- deprecation="${javac.deprecation}">
- <compilerarg line="${javac.args} ${javac.args.warnings}"/>
- <classpath refid="test.classpath"/>
- </javac>
- <delete file="${test.mapred.build.testshell}/testshell.jar"/>
- <jar jarfile="${test.mapred.build.testshell}/testshell.jar"
- basedir="${test.mapred.build.testshell}">
- </jar>
-
<delete dir="${test.cache.data}"/>
<mkdir dir="${test.cache.data}"/>
<delete dir="${test.concat.data}"/>
@@ -618,8 +586,6 @@
<jar jarfile="${hadoop-mapred-test-sources.jar}">
<fileset dir="${test.src.dir}/mapred" includes="org/apache/hadoop/**/*.java" />
<fileset dir="${test.src.dir}/unit" includes="org/apache/hadoop/**/*.java" />
- <fileset dir="${test.src.dir}/mapred/testjar" includes="*.java" />
- <fileset dir="${test.src.dir}/mapred/testshell" includes="*.java" />
</jar>
</target>