Author: suresh Date: Wed Mar 6 22:37:42 2013 New Revision: 1453599 URL: http://svn.apache.org/r1453599 Log: HADOOP-9373. Merge CHANGES.branch-trunk-win.txt to CHANGES.txt. Contributed by Suresh Srinivas.
Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.branch-trunk-win.txt hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt hadoop/common/trunk/hadoop-mapreduce-project/pom.xml Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.branch-trunk-win.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.branch-trunk-win.txt?rev=1453599&r1=1453598&r2=1453599&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.branch-trunk-win.txt (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.branch-trunk-win.txt Wed Mar 6 22:37:42 2013 @@ -1,17 +0,0 @@ -branch-trunk-win changes - unreleased - - MAPREDUCE-4739. Some MapReduce tests fail to find winutils. - (Chris Nauroth via suresh) - - MAPREDUCE-4780. MapReduce distribution build fails on Windows. - (Chris Nauroth via suresh) - - MAPREDUCE-4790. MapReduce build script would be more readable using abspath. - (Chris Nauroth via suresh) - - MAPREDUCE-4869. Fix TestMapReduceChildJVM. (Chris Nauroth via acmurthy) - - MAPREDUCE-4870. Fix TestMRJobsWithHistoryService. (Chris Nauroth via acmurthy) - - MAPREDUCE-4983. Fixed various platform specific assumptions in various tests, - so that they can pass on Windows too. (Chris Nauroth via vinodkv) Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1453599&r1=1453598&r2=1453599&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Wed Mar 6 22:37:42 2013 @@ -14,6 +14,10 @@ Trunk (Unreleased) MAPREDUCE-4887. Add RehashPartitioner, to smooth distributions with poor implementations of Object#hashCode(). (Radim Kolar via cutting) + HADOOP-8562. Enhancements to support Hadoop on Windows Server and Windows + Azure environments. (See breakdown of tasks below for subtasks and + contributors) + IMPROVEMENTS MAPREDUCE-3787. [Gridmix] Optimize job monitoring and STRESS mode for @@ -155,6 +159,24 @@ Trunk (Unreleased) MAPREDUCE-5012. Typo in javadoc for IdentityMapper class. (Adam Monsen via suresh) + BREAKDOWN OF HADOOP-8562 SUBTASKS + + MAPREDUCE-4739. Some MapReduce tests fail to find winutils. + (Chris Nauroth via suresh) + + MAPREDUCE-4780. MapReduce distribution build fails on Windows. + (Chris Nauroth via suresh) + + MAPREDUCE-4790. MapReduce build script would be more readable using abspath. + (Chris Nauroth via suresh) + + MAPREDUCE-4869. Fix TestMapReduceChildJVM. (Chris Nauroth via acmurthy) + + MAPREDUCE-4870. Fix TestMRJobsWithHistoryService. (Chris Nauroth via acmurthy) + + MAPREDUCE-4983. Fixed various platform specific assumptions in various tests, + so that they can pass on Windows too. (Chris Nauroth via vinodkv) + Release 2.0.4-beta - UNRELEASED INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-mapreduce-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/pom.xml?rev=1453599&r1=1453598&r2=1453599&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/pom.xml (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/pom.xml Wed Mar 6 22:37:42 2013 @@ -210,7 +210,6 @@ <excludes> <exclude>.eclipse.templates/</exclude> <exclude>CHANGES.txt</exclude> - <exclude>CHANGES.branch-trunk-win.txt</exclude> <exclude>lib/jdiff/**</exclude> </excludes> </configuration>