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

hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml

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

hadoop-mapreduce-project/CHANGES.txt

@@ -9,6 +9,9 @@ Hadoop MapReduce Change Log
     MAPREDUCE-4406. Users should be able to specify the MiniCluster ResourceManager 
     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 
 
   INCOMPATIBLE CHANGES