svn commit: r666862 - in /hadoop/core/branches/branch-0.17: CHANGES.txt build.xml

[cu...@apache.org]

Author: cutting
Date: Wed Jun 11 14:56:19 2008
New Revision: 666862

URL: http://svn.apache.org/viewvc?rev=666862&view=rev
Log:
Merge -r662503:662504 from trunk to 0.17 branch.  Fixes: HADOOP-3477.

Modified:
    hadoop/core/branches/branch-0.17/CHANGES.txt
    hadoop/core/branches/branch-0.17/build.xml

Modified: hadoop/core/branches/branch-0.17/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/CHANGES.txt?rev=666862&r1=666861&r2=666862&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.17/CHANGES.txt Wed Jun 11 14:56:19 2008
@@ -14,6 +14,10 @@
     HADOOP-3442. Limit recursion depth in QuickSort to avoid
     StackOverflowErrors. (cdouglas)
 
+    HADOOP-3477. Fix build to not package contrib/*/bin twice in
+    distributions.  (Adam Heath via cutting)
+
+
 Release 0.17.0 - 2008-05-18
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/branches/branch-0.17/build.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/build.xml?rev=666862&r1=666861&r2=666862&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/build.xml (original)
+++ hadoop/core/branches/branch-0.17/build.xml Wed Jun 11 14:56:19 2008
@@ -844,6 +844,7 @@
       <param.listofitems>
         <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}/**" />