accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject accumulo git commit: ACCUMULO-3827 set default store types for monitor ssl to jks
Date Mon, 18 May 2015 20:58:31 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master b3c131f9f -> c115bdfb8


ACCUMULO-3827 set default store types for monitor ssl to jks


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

Branch: refs/heads/master
Commit: c115bdfb8e95efa1a938184a7d0a06603d982470
Parents: b3c131f
Author: Billie Rinaldi <billie@apache.org>
Authored: Mon May 18 13:58:14 2015 -0700
Committer: Billie Rinaldi <billie@apache.org>
Committed: Mon May 18 13:58:14 2015 -0700

----------------------------------------------------------------------
 core/src/main/java/org/apache/accumulo/core/conf/Property.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c115bdfb/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 09d462d..7e10edf 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -358,11 +358,11 @@ public enum Property {
   MONITOR_SSL_KEYSTORE("monitor.ssl.keyStore", "", PropertyType.PATH, "The keystore for enabling
monitor SSL."),
   @Sensitive
   MONITOR_SSL_KEYSTOREPASS("monitor.ssl.keyStorePassword", "", PropertyType.STRING, "The
keystore password for enabling monitor SSL."),
-  MONITOR_SSL_KEYSTORETYPE("monitor.ssl.keyStoreType", "", PropertyType.STRING, "Type of
SSL keystore"),
+  MONITOR_SSL_KEYSTORETYPE("monitor.ssl.keyStoreType", "jks", PropertyType.STRING, "Type
of SSL keystore"),
   MONITOR_SSL_TRUSTSTORE("monitor.ssl.trustStore", "", PropertyType.PATH, "The truststore
for enabling monitor SSL."),
   @Sensitive
   MONITOR_SSL_TRUSTSTOREPASS("monitor.ssl.trustStorePassword", "", PropertyType.STRING, "The
truststore password for enabling monitor SSL."),
-  MONITOR_SSL_TRUSTSTORETYPE("monitor.ssl.trustStoreType", "", PropertyType.STRING, "Type
of SSL truststore"),
+  MONITOR_SSL_TRUSTSTORETYPE("monitor.ssl.trustStoreType", "jks", PropertyType.STRING, "Type
of SSL truststore"),
   MONITOR_SSL_INCLUDE_CIPHERS("monitor.ssl.include.ciphers", "", PropertyType.STRING,
       "A comma-separated list of allows SSL Ciphers, see monitor.ssl.exclude.ciphers to disallow
ciphers"),
   MONITOR_SSL_EXCLUDE_CIPHERS("monitor.ssl.exclude.ciphers", "", PropertyType.STRING,


Mime
View raw message