You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nd...@apache.org on 2015/02/25 20:10:33 UTC
hbase git commit: HBASE-13086 Show ZK root node on Master WebUI
(addendum)
Repository: hbase
Updated Branches:
refs/heads/0.98 5631f7761 -> 58c1c7434
HBASE-13086 Show ZK root node on Master WebUI (addendum)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/58c1c743
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/58c1c743
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/58c1c743
Branch: refs/heads/0.98
Commit: 58c1c7434f22b5a2a923de1d6504df6c061885ee
Parents: 5631f77
Author: Nick Dimiduk <nd...@apache.org>
Authored: Wed Feb 25 11:07:53 2015 -0800
Committer: Nick Dimiduk <nd...@apache.org>
Committed: Wed Feb 25 11:07:53 2015 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/master/TestMasterStatusServlet.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/58c1c743/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java
index d628639..3d2f7ff 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java
@@ -96,6 +96,7 @@ public class TestMasterStatusServlet {
ZooKeeperWatcher zkw = Mockito.mock(ZooKeeperWatcher.class);
Mockito.doReturn("fakequorum").when(zkw).getQuorum();
Mockito.doReturn(zkw).when(master).getZooKeeperWatcher();
+ Mockito.doReturn(zkw).when(master).getZooKeeper();
// Fake MasterAddressTracker
MasterAddressTracker tracker = Mockito.mock(MasterAddressTracker.class);