You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jm...@apache.org on 2016/10/04 23:43:14 UTC
hbase git commit: HBASE-16763 Remove unintentional dependency on
net.sf.ehcache.search.Results
Repository: hbase
Updated Branches:
refs/heads/master 89eb71f1b -> 0daeb635d
HBASE-16763 Remove unintentional dependency on net.sf.ehcache.search.Results
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0daeb635
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0daeb635
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0daeb635
Branch: refs/heads/master
Commit: 0daeb635d0af787e433d08f18691c79b2e44b68c
Parents: 89eb71f
Author: Jonathan M Hsieh <jo...@cloudera.com>
Authored: Tue Oct 4 10:54:24 2016 -0700
Committer: Jonathan M Hsieh <jm...@apache.org>
Committed: Tue Oct 4 16:40:15 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/master/MockRegionServer.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/0daeb635/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java
index 2d5cd49..3e430b5 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java
@@ -119,8 +119,6 @@ import org.apache.hadoop.hbase.zookeeper.MetaTableLocator;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
import org.apache.zookeeper.KeeperException;
-import net.sf.ehcache.search.Results;
-
/**
* A mock RegionServer implementation.
* Use this when you can't bend Mockito to your liking (e.g. return null result
@@ -137,7 +135,7 @@ ClientProtos.ClientService.BlockingInterface, RegionServerServices {
private final Random random = new Random();
/**
- * Map of regions to map of rows and {@link Results}. Used as data source when
+ * Map of regions to map of rows and {@link Result}. Used as data source when
* {@link MockRegionServer#get(byte[], Get)} is called. Because we have a byte
* key, need to use TreeMap and provide a Comparator. Use
* {@link #setGetResult(byte[], byte[], Result)} filling this map.