Revert "PHOENIX-2008 Integration tests are failing with HBase-1.1.0 because HBASE-13756(Rajeshbabu)"
This reverts commit 56e1c0a1f348572fb73e9d0b8bbfb053df7f8710. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/1a2f2dc1 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1a2f2dc1 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1a2f2dc1 Branch: refs/heads/4.x-HBase-1.1 Commit: 1a2f2dc1ea6dd75c224b78a0dc2b312b0e6f5bce Parents: 5546a42 Author: Rajeshbabu Chintaguntla <rajeshb...@apache.org> Authored: Wed May 27 14:52:25 2015 +0530 Committer: Rajeshbabu Chintaguntla <rajeshb...@apache.org> Committed: Wed May 27 14:52:25 2015 +0530 ---------------------------------------------------------------------- phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java | 2 -- 1 file changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/1a2f2dc1/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java index 4aa28c4..54ae670 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java @@ -620,8 +620,6 @@ public abstract class BaseTest { } //no point doing sanity checks when running tests. conf.setBoolean("hbase.table.sanity.checks", false); - // Remove this configuration once hbase has HBASE-13756 fix. - conf.set("hbase.regionserver.msginterval", "300000"); // set the server rpc controller and rpc scheduler factory, used to configure the cluster conf.set(RpcControllerFactory.CUSTOM_CONTROLLER_CONF_KEY, DEFAULT_SERVER_RPC_CONTROLLER_FACTORY); conf.set(RSRpcServices.REGION_SERVER_RPC_SCHEDULER_FACTORY_CLASS, DEFAULT_RPC_SCHEDULER_FACTORY);