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 cn...@apache.org on 2014/10/10 07:37:50 UTC
git commit: MAPREDUCE-6123. TestCombineFileInputFormat incorrectly
starts 2 MiniDFSCluster instances. Contributed by Chris Nauroth.
Repository: hadoop
Updated Branches:
refs/heads/trunk 2f0166db5 -> 777877d07
MAPREDUCE-6123. TestCombineFileInputFormat incorrectly starts 2 MiniDFSCluster instances. Contributed by Chris Nauroth.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/777877d0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/777877d0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/777877d0
Branch: refs/heads/trunk
Commit: 777877d079ecb025c293deac741800800e413179
Parents: 2f0166d
Author: cnauroth <cn...@apache.org>
Authored: Thu Oct 9 22:35:58 2014 -0700
Committer: cnauroth <cn...@apache.org>
Committed: Thu Oct 9 22:35:58 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/777877d0/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 262cc16..4660c19 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -417,6 +417,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/777877d0/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: