/[Apache-SVN]
ViewVC logotype

Revision 1338841


Jump to revision: Previous Next
Author: tgraves
Date: Tue May 15 19:15:43 2012 UTC (12 years, 5 months ago)
Changed paths: 41
Log Message:
merge -r 1338834:1338835 from trunk. FIXES: MAPREDUCE-4238

Changed paths

Path Details
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt modified , text changed
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/data_join/src/examples/org/apache/hadoop/contrib/utils/join/README.txt deleted
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/data_join/src/examples/org/apache/hadoop/contrib/utils/join/SampleDataJoinMapper.java deleted
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/data_join/src/examples/org/apache/hadoop/contrib/utils/join/SampleDataJoinReducer.java deleted
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/data_join/src/examples/org/apache/hadoop/contrib/utils/join/SampleTaggedMapOutput.java deleted
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/data_join/src/java/org/ deleted
Directoryhadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/data_join/src/test/org/ deleted
Directoryhadoop/common/branches/branch-2/hadoop-project/pom.xml modified , text changed
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin, r1338835)
added
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/pom.xml
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/pom.xml, r1338835)
replaced , text changed
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ArrayListBackedIterator.java
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ArrayListBackedIterator.java, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinJob.java
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinJob.java, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinMapperBase.java
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinMapperBase.java, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinReducerBase.java
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinReducerBase.java, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/JobBase.java
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/JobBase.java, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ResetableIterator.java
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ResetableIterator.java, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/TaggedMapOutput.java
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/TaggedMapOutput.java, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/README.txt
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/README.txt, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinMapper.java
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinMapper.java, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinReducer.java
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinReducer.java, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/SampleTaggedMapOutput.java
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/SampleTaggedMapOutput.java, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/org/
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/TestDataJoin.java
(Copied from hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/TestDataJoin.java, r1338835)
replaced
Directoryhadoop/common/branches/branch-2/hadoop-tools/hadoop-tools-dist/pom.xml modified , text changed
Directoryhadoop/common/branches/branch-2/hadoop-tools/pom.xml modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26