hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jeffr...@apache.org
Subject git commit: HBASE-12407: HConnectionKey doesn't contain CUSTOM_CONTROLLER_CONF_KEY in CONNECTION_PROPERTIES
Date Tue, 04 Nov 2014 05:02:24 GMT
Repository: hbase
Updated Branches:
  refs/heads/master ab927b8e1 -> 371bb39ee


HBASE-12407: HConnectionKey doesn't contain CUSTOM_CONTROLLER_CONF_KEY in CONNECTION_PROPERTIES


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

Branch: refs/heads/master
Commit: 371bb39ee6543727e6abb4989b2c136b3825b401
Parents: ab927b8
Author: Jeffrey Zhong <jeffreyz@apache.org>
Authored: Mon Nov 3 21:04:22 2014 -0800
Committer: Jeffrey Zhong <jeffreyz@apache.org>
Committed: Mon Nov 3 21:04:22 2014 -0800

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/hbase/client/HConnectionKey.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/371bb39e/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionKey.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionKey.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionKey.java
index 45c9bbb..0c20181 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionKey.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionKey.java
@@ -26,6 +26,7 @@ import java.util.Map;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.ipc.RpcControllerFactory;
 import org.apache.hadoop.hbase.security.User;
 import org.apache.hadoop.hbase.security.UserProvider;
 
@@ -47,7 +48,8 @@ class HConnectionKey {
       HConstants.HBASE_RPC_TIMEOUT_KEY,
       HConstants.HBASE_META_SCANNER_CACHING,
       HConstants.HBASE_CLIENT_INSTANCE_ID,
-      HConstants.RPC_CODEC_CONF_KEY };
+      HConstants.RPC_CODEC_CONF_KEY,
+      RpcControllerFactory.CUSTOM_CONTROLLER_CONF_KEY};
 
   private Map<String, String> properties;
   private String username;


Mime
View raw message