Author: tgraves Date: Tue May 15 19:15:43 2012 New Revision: 1338841 URL: http://svn.apache.org/viewvc?rev=1338841&view=rev Log: merge -r 1338834:1338835 from trunk. FIXES: MAPREDUCE-4238
Removed: hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/data_join/src/examples/org/apache/hadoop/contrib/utils/join/README.txt hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/data_join/src/examples/org/apache/hadoop/contrib/utils/join/SampleDataJoinMapper.java hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/data_join/src/examples/org/apache/hadoop/contrib/utils/join/SampleDataJoinReducer.java hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/data_join/src/examples/org/apache/hadoop/contrib/utils/join/SampleTaggedMapOutput.java hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/data_join/src/java/org/ hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/data_join/src/test/org/ 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=1338841&r1=1338840&r2=1338841&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue May 15 19:15:43 2012 @@ -376,6 +376,8 @@ Release 0.23.3 - UNRELEASED MAPREDUCE-4233. NPE can happen in RMNMNodeInfo. (bobby) + MAPREDUCE-4238. mavenize data_join. (tgraves) + Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES