hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yjzhan...@apache.org
Subject hadoop git commit: HDFS-9648. TestStartup.testImageChecksum is broken by HDFS-9569's message change. (Wei-Chiu Chuang via Yongjun Zhang)
Date Thu, 14 Jan 2016 20:57:06 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 9600736d8 -> cfeecf113


HDFS-9648. TestStartup.testImageChecksum is broken by HDFS-9569's message change. (Wei-Chiu
Chuang via Yongjun Zhang)

(cherry picked from commit 817cc1f02a60ef4e372171415058fdc76c0d2e39)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cfeecf11
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cfeecf11
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cfeecf11

Branch: refs/heads/branch-2
Commit: cfeecf113b8ee2255138c5da499b651d2fdd3251
Parents: 9600736
Author: Yongjun Zhang <yzhang@cloudera.com>
Authored: Thu Jan 14 12:36:36 2016 -0800
Committer: Yongjun Zhang <yzhang@cloudera.com>
Committed: Thu Jan 14 12:45:18 2016 -0800

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                       | 3 +++
 .../java/org/apache/hadoop/hdfs/server/namenode/TestStartup.java  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/cfeecf11/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 5d13936..32979f6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1747,6 +1747,9 @@ Release 2.7.3 - UNRELEASED
     HDFS-8914. Document HA support in the HDFS HdfsDesign.md.
     (Lars Francke via wheat9)
 
+    HDFS-9648. TestStartup.testImageChecksum is broken by HDFS-9569's message
+    change. (Wei-Chiu Chuang via Yongjun Zhang)
+
 Release 2.7.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/cfeecf11/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestStartup.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestStartup.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestStartup.java
index b8dda2a..9a7b9b5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestStartup.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestStartup.java
@@ -543,7 +543,7 @@ public class TestStartup {
           fail("Should not have successfully started with corrupt image");
         } catch (IOException ioe) {
           GenericTestUtils.assertExceptionContains(
-              "Failed to load an FSImage file!", ioe);
+              "Failed to load FSImage file", ioe);
           int md5failures = appender.countExceptionsWithMessage(
               " is corrupt with MD5 checksum of ");
           // Two namedirs, so should have seen two failures


Mime
View raw message