Author: atm
Date: Wed Jan 25 18:07:43 2012
New Revision: 1235856
URL: http://svn.apache.org/viewvc?rev=1235856&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-mapreduce-dist.xml
Propchange: hadoop/common/branches/HDFS-1623/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 25 18:07:43 2012
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1235379
+/hadoop/common/trunk:1152502-1235855
Modified:
hadoop/common/branches/HDFS-1623/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml?rev=1235856&r1=1235855&r2=1235856&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
Wed Jan 25 18:07:43 2012
@@ -127,6 +127,17 @@
<unpack>false</unpack>
</binaries>
</moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.apache.hadoop:hadoop-mapreduce-client-jobclient</include>
+ </includes>
+ <binaries>
+ <attachmentClassifier>tests</attachmentClassifier>
+ <outputDirectory>share/hadoop/${hadoop.component}</outputDirectory>
+ <includeDependencies>false</includeDependencies>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
</moduleSets>
<dependencySets>
<dependencySet>
