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 tu...@apache.org on 2011/10/12 22:38:51 UTC

svn commit: r1182575 - /hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml

Author: tucu
Date: Wed Oct 12 20:38:51 2011
New Revision: 1182575

URL: http://svn.apache.org/viewvc?rev=1182575&view=rev
Log:
MAPREDUCE-3171. normalize nodemanager native code compilation with common/hdfs native. (tucu)

Modified:
    hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml

Modified: hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml?rev=1182575&r1=1182574&r2=1182575&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml (original)
+++ hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml Wed Oct 12 20:38:51 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>