hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1209169 - in /hadoop/common/branches/HDFS-1623: ./ hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml hadoop-tools/hadoop-streaming/pom.xml
Date Thu, 01 Dec 2011 18:15:49 GMT
Author: atm
Date: Thu Dec  1 18:15:46 2011
New Revision: 1209169

URL: http://svn.apache.org/viewvc?rev=1209169&view=rev
Log:
Merge trunk into HA branch.

Modified:
    hadoop/common/branches/HDFS-1623/   (props changed)
    hadoop/common/branches/HDFS-1623/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
    hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-streaming/pom.xml

Propchange: hadoop/common/branches/HDFS-1623/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  1 18:15:46 2011
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1208622
+/hadoop/common/trunk:1152502-1209165

Modified: hadoop/common/branches/HDFS-1623/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml?rev=1209169&r1=1209168&r2=1209169&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
(original)
+++ hadoop/common/branches/HDFS-1623/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
Thu Dec  1 18:15:46 2011
@@ -107,6 +107,13 @@
       <directory>${project.build.directory}/site</directory>
       <outputDirectory>/share/doc/hadoop/${hadoop.component}</outputDirectory>
     </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/native</directory>
+      <includes>
+        <include>*.h</include>
+      </includes>
+      <outputDirectory>/include</outputDirectory>
+    </fileSet>
   </fileSets>
   <dependencySets>
     <dependencySet>

Modified: hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-streaming/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-streaming/pom.xml?rev=1209169&r1=1209168&r2=1209169&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-streaming/pom.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-streaming/pom.xml Thu Dec  1 18:15:46
2011
@@ -116,6 +116,17 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+         <configuration>
+          <archive>
+           <manifest>
+            <mainClass>org.apache.hadoop.streaming.HadoopStreaming</mainClass>
+           </manifest>
+         </archive>
+        </configuration>
+       </plugin>
     </plugins>
   </build>
 </project>



Mime
View raw message