Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge -r 1363161:1363162 from trunk to branch. FIXES: MAPREDUCE-4407 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363163 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alejandro Abdelnur 2012-07-18 22:43:52 +00:00
parent e69e5c9cd3
commit 52fa40b8ba
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
View File

@ -126,9 +126,6 @@
</fileSets> </fileSets>
<moduleSets> <moduleSets>
<moduleSet> <moduleSet>
<excludes>
<exclude>org.apache.hadoop:hadoop-yarn-server-tests</exclude>
</excludes>
<binaries> <binaries>
<outputDirectory>share/hadoop/${hadoop.component}</outputDirectory> <outputDirectory>share/hadoop/${hadoop.component}</outputDirectory>
<includeDependencies>false</includeDependencies> <includeDependencies>false</includeDependencies>
@ -138,6 +135,7 @@
<moduleSet> <moduleSet>
<includes> <includes>
<include>org.apache.hadoop:hadoop-mapreduce-client-jobclient</include> <include>org.apache.hadoop:hadoop-mapreduce-client-jobclient</include>
<include>org.apache.hadoop:hadoop-yarn-server-tests</include>
</includes> </includes>
<binaries> <binaries>
<attachmentClassifier>tests</attachmentClassifier> <attachmentClassifier>tests</attachmentClassifier>

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -9,6 +9,9 @@ Hadoop MapReduce Change Log
MAPREDUCE-4406. Users should be able to specify the MiniCluster ResourceManager MAPREDUCE-4406. Users should be able to specify the MiniCluster ResourceManager
and JobHistoryServer ports. (ahmed via tucu) and JobHistoryServer ports. (ahmed via tucu)
MAPREDUCE-4407. Add hadoop-yarn-server-tests-<version>-tests.jar to hadoop dist
package. (ahmed via tucu)
Release 2.1.0-alpha - Unreleased Release 2.1.0-alpha - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES