You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2017/07/31 19:55:43 UTC
[1/6] accumulo git commit: ACCUMULO-3827 set default store types for
monitor ssl to jks
Repository: accumulo
Updated Branches:
refs/heads/1.7 a1b395520 -> 7619532e0
refs/heads/1.8 67f5e95d8 -> 0ee13f25c
refs/heads/master 1132ae05a -> a9207d537
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/7619532e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7619532e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7619532e
Branch: refs/heads/1.7
Commit: 7619532e0543a98293f21bfe31ec62a9a2afb8da
Parents: a1b3955
Author: Billie Rinaldi <bi...@apache.org>
Authored: Mon May 18 13:58:14 2015 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Mon Jul 31 15:24:00 2017 -0400
----------------------------------------------------------------------
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/7619532e/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 0e7026f..800db90 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
@@ -384,11 +384,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,
[5/6] accumulo git commit: Merge branch '1.7' into 1.8
Posted by el...@apache.org.
Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0ee13f25
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0ee13f25
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0ee13f25
Branch: refs/heads/1.8
Commit: 0ee13f25cc56b3ca92449f840065ee2eef34c113
Parents: 67f5e95 7619532
Author: Josh Elser <el...@apache.org>
Authored: Mon Jul 31 15:55:13 2017 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Jul 31 15:55:13 2017 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/6] accumulo git commit: ACCUMULO-3827 set default store types for
monitor ssl to jks
Posted by el...@apache.org.
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/7619532e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7619532e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7619532e
Branch: refs/heads/master
Commit: 7619532e0543a98293f21bfe31ec62a9a2afb8da
Parents: a1b3955
Author: Billie Rinaldi <bi...@apache.org>
Authored: Mon May 18 13:58:14 2015 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Mon Jul 31 15:24:00 2017 -0400
----------------------------------------------------------------------
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/7619532e/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 0e7026f..800db90 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
@@ -384,11 +384,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,
[6/6] accumulo git commit: Merge branch '1.8'
Posted by el...@apache.org.
Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a9207d53
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a9207d53
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a9207d53
Branch: refs/heads/master
Commit: a9207d537cce5707919ac67ff931476c44162e56
Parents: 1132ae0 0ee13f2
Author: Josh Elser <el...@apache.org>
Authored: Mon Jul 31 15:55:29 2017 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Jul 31 15:55:29 2017 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/6] accumulo git commit: Merge branch '1.7' into 1.8
Posted by el...@apache.org.
Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0ee13f25
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0ee13f25
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0ee13f25
Branch: refs/heads/master
Commit: 0ee13f25cc56b3ca92449f840065ee2eef34c113
Parents: 67f5e95 7619532
Author: Josh Elser <el...@apache.org>
Authored: Mon Jul 31 15:55:13 2017 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Jul 31 15:55:13 2017 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/6] accumulo git commit: ACCUMULO-3827 set default store types for
monitor ssl to jks
Posted by el...@apache.org.
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/7619532e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7619532e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7619532e
Branch: refs/heads/1.8
Commit: 7619532e0543a98293f21bfe31ec62a9a2afb8da
Parents: a1b3955
Author: Billie Rinaldi <bi...@apache.org>
Authored: Mon May 18 13:58:14 2015 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Mon Jul 31 15:24:00 2017 -0400
----------------------------------------------------------------------
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/7619532e/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 0e7026f..800db90 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
@@ -384,11 +384,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,