Author: tgraves
Date: Tue May 15 19:34:01 2012
New Revision: 1338852
URL: http://svn.apache.org/viewvc?rev=1338852&view=rev
Log:
merge -r 1338840:1338841 from branch-2. FIXES: MAPREDUCE-4238
Removed:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/data_join/src/examples/org/apache/hadoop/contrib/utils/join/README.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/data_join/src/examples/org/apache/hadoop/contrib/utils/join/SampleDataJoinMapper.java
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/data_join/src/examples/org/apache/hadoop/contrib/utils/join/SampleDataJoinReducer.java
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/data_join/src/examples/org/apache/hadoop/contrib/utils/join/SampleTaggedMapOutput.java
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/data_join/src/java/org/
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/src/contrib/data_join/src/test/org/
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1338852&r1=1338851&r2=1338852&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Tue
May 15 19:34:01 2012
@@ -193,6 +193,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
