Repository: hadoop Updated Branches: refs/heads/trunk 8d0ef3163 -> 3c2397cb0
HDFS-8568. TestClusterId#testFormatWithEmptyClusterIdOption is failing. Contributed by Rakesh R. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3c2397cb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3c2397cb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3c2397cb Branch: refs/heads/trunk Commit: 3c2397cb041068172c8ad209996414d7371d2eca Parents: 8d0ef31 Author: Xiaoyu Yao <x...@apache.org> Authored: Tue Jun 9 12:15:38 2015 -0700 Committer: Xiaoyu Yao <x...@apache.org> Committed: Tue Jun 9 12:16:24 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../org/apache/hadoop/hdfs/server/namenode/TestClusterId.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3c2397cb/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 5147e38..fad2707 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -615,6 +615,9 @@ Release 2.8.0 - UNRELEASED HDFS-8552. Fix hdfs CLI usage message for namenode and zkfc. (Brahma Reddy Battula via xyao) + HDFS-8568. TestClusterId#testFormatWithEmptyClusterIdOption is failing. + (Rakesh R. via xyao) + OPTIMIZATIONS HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than http://git-wip-us.apache.org/repos/asf/hadoop/blob/3c2397cb/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestClusterId.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestClusterId.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestClusterId.java index 7c23dd5..28ecd10 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestClusterId.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestClusterId.java @@ -236,7 +236,7 @@ public class TestClusterId { NameNode.createNameNode(argv, config); // Check if usage is printed - assertTrue(baos.toString("UTF-8").contains("Usage: java NameNode")); + assertTrue(baos.toString("UTF-8").contains("Usage: hdfs namenode")); System.setErr(origErr); // check if the version file does not exists. @@ -262,7 +262,7 @@ public class TestClusterId { NameNode.createNameNode(argv, config); // Check if usage is printed - assertTrue(baos.toString("UTF-8").contains("Usage: java NameNode")); + assertTrue(baos.toString("UTF-8").contains("Usage: hdfs namenode")); System.setErr(origErr); // check if the version file does not exists. @@ -289,7 +289,7 @@ public class TestClusterId { NameNode.createNameNode(argv, config); // Check if usage is printed - assertTrue(baos.toString("UTF-8").contains("Usage: java NameNode")); + assertTrue(baos.toString("UTF-8").contains("Usage: hdfs namenode")); System.setErr(origErr); // check if the version file does not exists.