You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by el...@apache.org on 2018/05/25 21:32:57 UTC
[4/9] phoenix git commit: PHOENIX-4672 Align the kerberos principal
config keys
PHOENIX-4672 Align the kerberos principal config keys
Fix the configuration keys in a manner that won't break users
who are using the 'old' name.
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e71e7678
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e71e7678
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e71e7678
Branch: refs/heads/4.x-HBase-1.1
Commit: e71e76780ddb30bca8ca227019a298094ba0cd68
Parents: 838914e
Author: Josh Elser <el...@apache.org>
Authored: Tue Apr 10 14:08:57 2018 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri May 25 16:37:50 2018 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/phoenix/query/QueryServices.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e71e7678/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java
index 5e0a8f1..cbc9a72 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java
@@ -239,7 +239,8 @@ public interface QueryServices extends SQLCloseable {
public static final String QUERY_SERVER_KEYTAB_FILENAME_ATTRIB = "phoenix.queryserver.keytab.file";
public static final String QUERY_SERVER_HTTP_KEYTAB_FILENAME_ATTRIB = "phoenix.queryserver.http.keytab.file";
public static final String QUERY_SERVER_KERBEROS_PRINCIPAL_ATTRIB = "phoenix.queryserver.kerberos.principal";
- public static final String QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB = "phoenix.queryserver.kerberos.http.principal";
+ public static final String QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB_LEGACY = "phoenix.queryserver.kerberos.http.principal";
+ public static final String QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB = "phoenix.queryserver.http.kerberos.principal";
public static final String QUERY_SERVER_DNS_NAMESERVER_ATTRIB = "phoenix.queryserver.dns.nameserver";
public static final String QUERY_SERVER_DNS_INTERFACE_ATTRIB = "phoenix.queryserver.dns.interface";
public static final String QUERY_SERVER_HBASE_SECURITY_CONF_ATTRIB = "hbase.security.authentication";