You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2014/10/10 21:01:24 UTC
[45/50] [abbrv] git commit: MAPREDUCE-6123.
TestCombineFileInputFormat incorrectly starts 2 MiniDFSCluster instances.
Contributed by Chris Nauroth.
MAPREDUCE-6123. TestCombineFileInputFormat incorrectly starts 2 MiniDFSCluster instances. Contributed by Chris Nauroth.
(cherry picked from commit 777877d079ecb025c293deac741800800e413179)
(cherry picked from commit f6278cbac50522302ee7ad3cbbe21d0aeefa76d8)
(cherry picked from commit 308e3368533990d3cde74c30cbc30be861c8809b)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5794c706
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5794c706
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5794c706
Branch: refs/heads/champlain
Commit: 5794c706db0b2b9f253218aa91c27f76405c083a
Parents: 75e4230
Author: cnauroth <cn...@apache.org>
Authored: Thu Oct 9 22:35:58 2014 -0700
Committer: cnauroth <cn...@apache.org>
Committed: Thu Oct 9 22:55:12 2014 -0700
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 3 +++
.../hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java | 4 ----
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5794c706/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index a75d8a8..57f3e17 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -195,6 +195,9 @@ Release 2.6.0 - UNRELEASED
MAPREDUCE-6122. TestLineRecordReader may fail due to test data files checked
out of git with incorrect line endings. (cnauroth)
+ MAPREDUCE-6123. TestCombineFileInputFormat incorrectly starts 2
+ MiniDFSCluster instances. (cnauroth)
+
Release 2.5.1 - 2014-09-05
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5794c706/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java
index 4290914..db51ec6 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java
@@ -1286,10 +1286,6 @@ public class TestCombineFileInputFormat extends TestCase {
.build();
dfs.waitActive();
- dfs = new MiniDFSCluster.Builder(conf).racks(rack1).hosts(hosts1)
- .build();
- dfs.waitActive();
-
FileSystem fileSys = dfs.getFileSystem();
// Set up the following directory structure: