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 <[email protected]> Authored: Tue Aug 26 13:17:19 2014 -0400 Committer: Josh Elser <[email protected]> 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"),
