Author: tucu Date: Wed Jul 18 22:43:52 2012 New Revision: 1363163 URL: http://svn.apache.org/viewvc?rev=1363163&view=rev Log: Merge -r 1363161:1363162 from trunk to branch. FIXES: MAPREDUCE-4407
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1363163&r1=1363162&r2=1363163&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Wed Jul 18 22:43:52 2012 @@ -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