From 27bbcc4c5c9b94f767408fd25fadaf10ca076129 Mon Sep 17 00:00:00 2001 From: Siddharth Seth Date: Tue, 19 Jun 2012 21:54:00 +0000 Subject: [PATCH] Merge MAPREDUCE-4270 from trunk. Move the data_join test classes to the correct path. (Contributed by Thomas Graves) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351870 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../java/{ => org/apache/hadoop/contrib/utils/join}/README.txt | 0 .../hadoop/contrib/utils/join}/SampleDataJoinMapper.java | 0 .../hadoop/contrib/utils/join}/SampleDataJoinReducer.java | 0 .../hadoop/contrib/utils/join}/SampleTaggedMapOutput.java | 0 5 files changed, 3 insertions(+) rename hadoop-tools/hadoop-datajoin/src/test/java/{ => org/apache/hadoop/contrib/utils/join}/README.txt (100%) rename hadoop-tools/hadoop-datajoin/src/test/java/{ => org/apache/hadoop/contrib/utils/join}/SampleDataJoinMapper.java (100%) rename hadoop-tools/hadoop-datajoin/src/test/java/{ => org/apache/hadoop/contrib/utils/join}/SampleDataJoinReducer.java (100%) rename hadoop-tools/hadoop-datajoin/src/test/java/{ => org/apache/hadoop/contrib/utils/join}/SampleTaggedMapOutput.java (100%) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index e4f98ec8405..1de95a8239f 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -471,6 +471,9 @@ Release 0.23.3 - UNRELEASED MAPREDUCE-4341. add types to capacity scheduler properties documentation (Karthik Kambatla via tgraves) + MAPREDUCE-4270. Move the data_join test classes to the correct path. + (Thomas Graves via sseth) + Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-tools/hadoop-datajoin/src/test/java/README.txt b/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/README.txt similarity index 100% rename from hadoop-tools/hadoop-datajoin/src/test/java/README.txt rename to hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/README.txt diff --git a/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinMapper.java b/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleDataJoinMapper.java similarity index 100% rename from hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinMapper.java rename to hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleDataJoinMapper.java diff --git a/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinReducer.java b/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleDataJoinReducer.java similarity index 100% rename from hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinReducer.java rename to hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleDataJoinReducer.java diff --git a/hadoop-tools/hadoop-datajoin/src/test/java/SampleTaggedMapOutput.java b/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleTaggedMapOutput.java similarity index 100% rename from hadoop-tools/hadoop-datajoin/src/test/java/SampleTaggedMapOutput.java rename to hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleTaggedMapOutput.java