Repository: hbase
Updated Branches:
  refs/heads/branch-2 8da096b23 -> ad266a4b6


HBASE-18560 Fixed master.assignment.TestAssignmentManager hangs on master and 
it shows up in flaky list


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

Branch: refs/heads/branch-2
Commit: ad266a4b669d2276f64e638ebc21ca2c70e69781
Parents: 8da096b
Author: Umesh Agashe <uaga...@cloudera.com>
Authored: Thu Aug 10 14:39:23 2017 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Thu Aug 10 15:01:15 2017 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/master/MockNoopMasterServices.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/ad266a4b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java
----------------------------------------------------------------------
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java
index 1636ba5..aac0e21 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java
@@ -447,7 +447,7 @@ public class MockNoopMasterServices implements 
MasterServices, Server {
 
   @Override
   public String getRegionServerVersion(ServerName sn) {
-    return null;
+    return "0.0.0";
   }
 
   @Override

Reply via email to