Repository: hive Updated Branches: refs/heads/master b6075d7c0 -> 521d9e9c3
HIVE-15025: Secure-Socket-Layer (SSL) support for HMS (addendum) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/521d9e9c Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/521d9e9c Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/521d9e9c Branch: refs/heads/master Commit: 521d9e9c3ada2c8f463c52741c17863133b90087 Parents: b6075d7 Author: Aihua Xu <aihu...@apache.org> Authored: Fri Oct 28 16:27:36 2016 -0400 Committer: Aihua Xu <aihu...@apache.org> Committed: Fri Oct 28 16:28:36 2016 -0400 ---------------------------------------------------------------------- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/521d9e9c/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java ---------------------------------------------------------------------- diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 15de10b..2f3fba7 100644 --- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -912,9 +912,9 @@ public class HiveConf extends Configuration { HIVE_METASTORE_SSL_KEYSTORE_PASSWORD("hive.metastore.keystore.password", "", "Metastore SSL certificate keystore password."), HIVE_METASTORE_SSL_TRUSTSTORE_PATH("hive.metastore.truststore.path", "", - "Metastore SSL certificate keystore location."), + "Metastore SSL certificate truststore location."), HIVE_METASTORE_SSL_TRUSTSTORE_PASSWORD("hive.metastore.truststore.password", "", - "Metastore SSL certificate keystore password."), + "Metastore SSL certificate truststore password."), // Parameters for exporting metadata on table drop (requires the use of the) // org.apache.hadoop.hive.ql.parse.MetaDataExportListener preevent listener