You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by to...@apache.org on 2010/06/24 20:27:13 UTC
svn commit: r957670 - in /hadoop/hdfs/branches/branch-0.21: CHANGES.txt
build.xml
Author: tomwhite
Date: Thu Jun 24 18:27:13 2010
New Revision: 957670
URL: http://svn.apache.org/viewvc?rev=957670&view=rev
Log:
Merge -r 957668:957669 from trunk to branch-0.21. Fixes: HDFS-1256.
Modified:
hadoop/hdfs/branches/branch-0.21/CHANGES.txt
hadoop/hdfs/branches/branch-0.21/build.xml
Modified: hadoop/hdfs/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/CHANGES.txt?rev=957670&r1=957669&r2=957670&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.21/CHANGES.txt Thu Jun 24 18:27:13 2010
@@ -892,6 +892,8 @@ Release 0.21.0 - Unreleased
HDFS-1255. Fix failing test-libhdfs.sh test. (tomwhite)
+ HDFS-1256. libhdfs is missing from the tarball. (tomwhite)
+
Release 0.20.3 - Unreleased
IMPROVEMENTS
Modified: hadoop/hdfs/branches/branch-0.21/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/build.xml?rev=957670&r1=957669&r2=957670&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/build.xml (original)
+++ hadoop/hdfs/branches/branch-0.21/build.xml Thu Jun 24 18:27:13 2010
@@ -242,7 +242,8 @@
<mkdir dir="${build.webapps}/datanode/WEB-INF"/>
<mkdir dir="${build.webapps}/secondary/WEB-INF"/>
<mkdir dir="${build.anttasks}"/>
-
+ <mkdir dir="${build.dir}/c++"/>
+
<mkdir dir="${test.build.dir}"/>
<mkdir dir="${test.build.classes}"/>
<mkdir dir="${test.build.extraconf}"/>
@@ -949,6 +950,10 @@
<fileset dir="src" excludes="**/*.template **/docs/build/**/*"/>
</copy>
+ <copy todir="${dist.dir}/c++" includeEmptyDirs="false">
+ <fileset dir="${build.dir}/c++"/>
+ </copy>
+
<copy todir="${dist.dir}/" file="build.xml"/>
<chmod perm="ugo+x" type="file" parallel="false">