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 2014/08/26 20:34:27 UTC
[1/3] git commit: ACCUMULO-3060 Remove Experimental annotations from
monitor SSL properties
Repository: accumulo
Updated Branches:
refs/heads/1.6.1-SNAPSHOT 3d3d301f4 -> 2eabaf75b
refs/heads/master 5c48ec8a3 -> 8353b33eb
ACCUMULO-3060 Remove Experimental annotations from monitor SSL properties
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2eabaf75
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2eabaf75
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2eabaf75
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 2eabaf75b0a6e61914edc54f41bf5bb3ad06778c
Parents: 3d3d301
Author: Josh Elser <el...@apache.org>
Authored: Tue Aug 26 13:17:19 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Aug 26 13:17:19 2014 -0400
----------------------------------------------------------------------
core/src/main/java/org/apache/accumulo/core/conf/Property.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2eabaf75/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 d7d78a6..6167b25 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
@@ -299,14 +299,10 @@ public enum Property {
MONITOR_BANNER_BACKGROUND("monitor.banner.background", "#304065", PropertyType.STRING,
"The background color of the banner text displayed on the monitor page."),
- @Experimental
MONITOR_SSL_KEYSTORE("monitor.ssl.keyStore", "", PropertyType.PATH, "The keystore for enabling monitor SSL."),
- @Experimental
@Sensitive
MONITOR_SSL_KEYSTOREPASS("monitor.ssl.keyStorePassword", "", PropertyType.STRING, "The keystore password for enabling monitor SSL."),
- @Experimental
MONITOR_SSL_TRUSTSTORE("monitor.ssl.trustStore", "", PropertyType.PATH, "The truststore for enabling monitor SSL."),
- @Experimental
@Sensitive
MONITOR_SSL_TRUSTSTOREPASS("monitor.ssl.trustStorePassword", "", PropertyType.STRING, "The truststore password for enabling monitor SSL."),
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"),
[3/3] git commit: Merge branch '1.6.1-SNAPSHOT'
Posted by el...@apache.org.
Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8353b33e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8353b33e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8353b33e
Branch: refs/heads/master
Commit: 8353b33ebc31aca800ab27308cfe16dedfe24379
Parents: 5c48ec8 2eabaf7
Author: Josh Elser <el...@apache.org>
Authored: Tue Aug 26 14:34:10 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Aug 26 14:34:10 2014 -0400
----------------------------------------------------------------------
core/src/main/java/org/apache/accumulo/core/conf/Property.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8353b33e/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------
[2/3] git commit: ACCUMULO-3060 Remove Experimental annotations from
monitor SSL properties
Posted by el...@apache.org.
ACCUMULO-3060 Remove Experimental annotations from monitor SSL properties
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2eabaf75
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2eabaf75
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2eabaf75
Branch: refs/heads/master
Commit: 2eabaf75b0a6e61914edc54f41bf5bb3ad06778c
Parents: 3d3d301
Author: Josh Elser <el...@apache.org>
Authored: Tue Aug 26 13:17:19 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Aug 26 13:17:19 2014 -0400
----------------------------------------------------------------------
core/src/main/java/org/apache/accumulo/core/conf/Property.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2eabaf75/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 d7d78a6..6167b25 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
@@ -299,14 +299,10 @@ public enum Property {
MONITOR_BANNER_BACKGROUND("monitor.banner.background", "#304065", PropertyType.STRING,
"The background color of the banner text displayed on the monitor page."),
- @Experimental
MONITOR_SSL_KEYSTORE("monitor.ssl.keyStore", "", PropertyType.PATH, "The keystore for enabling monitor SSL."),
- @Experimental
@Sensitive
MONITOR_SSL_KEYSTOREPASS("monitor.ssl.keyStorePassword", "", PropertyType.STRING, "The keystore password for enabling monitor SSL."),
- @Experimental
MONITOR_SSL_TRUSTSTORE("monitor.ssl.trustStore", "", PropertyType.PATH, "The truststore for enabling monitor SSL."),
- @Experimental
@Sensitive
MONITOR_SSL_TRUSTSTOREPASS("monitor.ssl.trustStorePassword", "", PropertyType.STRING, "The truststore password for enabling monitor SSL."),
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"),