Author: gkesavan
Date: Tue Jun 2 04:40:05 2009
New Revision: 780934
URL: http://svn.apache.org/viewvc?rev=780934&view=rev
Log:
Merge of -r 773835:773836 from trunk to branch-0.20 to fix HADOOP-5648.
Modified:
hadoop/core/branches/branch-0.20/CHANGES.txt
hadoop/core/branches/branch-0.20/src/benchmarks/gridmix2/build.xml
Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=780934&r1=780933&r2=780934&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Tue Jun 2 04:40:05 2009
@@ -103,6 +103,9 @@
HADOOP-5937. Correct a safemode message in FSNamesystem. (Ravi Phulari
via szetszwo)
+
+ HADOOP-5648. Fixes a build issue in not being able to generate gridmix.jar
+ in hadoop binary tarball. (Giridharan Kesavan via gkesavan)
Release 0.20.0 - 2009-04-15
Modified: hadoop/core/branches/branch-0.20/src/benchmarks/gridmix2/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/benchmarks/gridmix2/build.xml?rev=780934&r1=780933&r2=780934&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/benchmarks/gridmix2/build.xml
(original)
+++ hadoop/core/branches/branch-0.20/src/benchmarks/gridmix2/build.xml Tue Jun
2 04:40:05 2009
@@ -59,7 +59,7 @@
<include name="*.jar" />
<exclude name="**/excluded/" />
</fileset>
- <fileset dir="${hadoop.dir}/build">
+ <fileset dir="${hadoop.dir}">
<include name="**.jar" />
<include name="contrib/streaming/*.jar" />
</fileset>
