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/5b3fd404 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/5b3fd404 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/5b3fd404 Branch: refs/heads/4.x-HBase-0.98 Commit: 5b3fd404184cc6291bb2d3773e5e0b40c193cf01 Parents: 9a7bf33 Author: Josh Elser <els...@apache.org> Authored: Tue Apr 10 14:08:57 2018 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri May 25 17:07:13 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/5b3fd404/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 add756e..0a506ac 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 @@ -234,7 +234,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";
