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 to...@apache.org on 2011/01/12 02:31:07 UTC
svn commit: r1057969 - in /hadoop/common/branches/branch-0.22: CHANGES.txt
build.xml
Author: todd
Date: Wed Jan 12 01:31:06 2011
New Revision: 1057969
URL: http://svn.apache.org/viewvc?rev=1057969&view=rev
Log:
HADOOP-7100. Fix build to not refer to contrib/ec2 removed by HADOOP-6811. Contributed by Todd Lipcon
Modified:
hadoop/common/branches/branch-0.22/CHANGES.txt
hadoop/common/branches/branch-0.22/build.xml
Modified: hadoop/common/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/CHANGES.txt?rev=1057969&r1=1057968&r2=1057969&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/CHANGES.txt Wed Jan 12 01:31:06 2011
@@ -371,6 +371,9 @@ Release 0.22.0 - Unreleased
HADOOP-7091. reloginFromKeytab() should happen even if TGT can't be found.
(Kan Zhang via todd)
+ HADOOP-7100. Fix build to not refer to contrib/ec2 removed by HADOOP-6811
+ (todd)
+
Release 0.21.1 - Unreleased
IMPROVEMENTS
Modified: hadoop/common/branches/branch-0.22/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/build.xml?rev=1057969&r1=1057968&r2=1057969&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/build.xml (original)
+++ hadoop/common/branches/branch-0.22/build.xml Wed Jan 12 01:31:06 2011
@@ -1122,7 +1122,6 @@
<fileset dir="${dist.dir}/src/contrib/">
<include name="*/bin/*" />
</fileset>
- <fileset dir="${dist.dir}/src/contrib/ec2/bin/image"/>
</chmod>
</target>
@@ -1136,15 +1135,11 @@
<tarfileset dir="${build.dir}" mode="664">
<exclude name="${final.name}/bin/*" />
<exclude name="${final.name}/contrib/*/bin/*" />
- <exclude name="${final.name}/src/contrib/ec2/bin/*" />
- <exclude name="${final.name}/src/contrib/ec2/bin/image/*" />
<include name="${final.name}/**" />
</tarfileset>
<tarfileset dir="${build.dir}" mode="755">
<include name="${final.name}/bin/*" />
<include name="${final.name}/contrib/*/bin/*" />
- <include name="${final.name}/src/contrib/ec2/bin/*" />
- <include name="${final.name}/src/contrib/ec2/bin/image/*" />
</tarfileset>
</param.listofitems>
</macro_tar>