hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject svn commit: r1190619 - /hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
Date Fri, 28 Oct 2011 22:03:21 GMT
Author: tucu
Date: Fri Oct 28 22:03:21 2011
New Revision: 1190619

URL: http://svn.apache.org/viewvc?rev=1190619&view=rev
Log:
Merge -r 1182574:1182575 from trunk to branch. FIXES: MAPREDUCE-3171

Modified:
    hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml

Modified: hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml?rev=1190619&r1=1190618&r2=1190619&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
Fri Oct 28 22:03:21 2011
@@ -9,11 +9,8 @@
   <!-- TODO: this layout is wrong. We need module specific bin files in module specific
dirs -->
   <fileSets>
     <fileSet>
-      <directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/target/classes/bin</directory>
+      <directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/target/native/target/usr/local/bin</directory>
       <outputDirectory>bin</outputDirectory>
-      <includes>
-        <include>container-executor</include>
-      </includes>
       <fileMode>0755</fileMode>
     </fileSet>
     <fileSet>
@@ -54,7 +51,6 @@
         <exclude>**/SecurityAuth.audit*</exclude>
       </excludes>
       <includes>
-        <include>assembly/**</include>
         <include>pom.xml</include>
         <include>build*.xml</include>
         <include>ivy.xml</include>



Mime
View raw message