[6/6] accumulo git commit: Merge branch '1.6'

[elserj]

Merge branch '1.6'

Conflicts:
        server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
        
server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java


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

Branch: refs/heads/master
Commit: 3922e1ab4d061411be1cb750e67a42f0643e1da0
Parents: 6b5f5ef 9ea8f09
Author: Josh Elser <els...@apache.org>
Authored: Fri Nov 7 18:29:19 2014 -0500
Committer: Josh Elser <els...@apache.org>
Committed: Fri Nov 7 18:29:19 2014 -0500

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/core/conf/Property.java |  1 +
 .../main/java/org/apache/accumulo/server/Accumulo.java    | 10 ++++++++++
 .../org/apache/accumulo/monitor/EmbeddedWebServer.java    |  5 +++++
 3 files changed, 16 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3922e1ab/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3922e1ab/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
index 87c615e,a1581c4..5534045
--- a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java
@@@ -198,7 -208,17 +199,16 @@@ public class Accumulo 
        log.info(key + " = " + (Property.isSensitive(key) ? "<hidden>" : 
entry.getValue()));
      }
  
 -    monitorSwappiness();
 +    monitorSwappiness(conf);
+ 
+     // Encourage users to configure TLS
+     final String SSL = "SSL";
+     for (Property sslProtocolProperty : 
Arrays.asList(Property.MONITOR_SSL_INCLUDE_PROTOCOLS)) {
+       String value = conf.get(sslProtocolProperty);
+       if (value.contains(SSL)) {
+         log.warn("It is recommended that " + sslProtocolProperty + " only 
allow TLS");
+       }
+     }
 -
    }
  
    /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3922e1ab/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
----------------------------------------------------------------------
diff --cc 
server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
index 18ef4e1,af91136..46fe54b
--- 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
+++ 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
@@@ -64,7 -64,12 +64,12 @@@ public class EmbeddedWebServer 
          
sslContextFactory.setExcludeCipherSuites(StringUtils.split(excludedCiphers, 
','));
        }
  
+       final String includeProtocols = 
conf.get(Property.MONITOR_SSL_INCLUDE_PROTOCOLS);
+       if (null != includeProtocols && !includeProtocols.isEmpty()) {
+         
sslContextFactory.setIncludeProtocols(StringUtils.split(includeProtocols, ','));
+       }
+ 
 -      connector = new SslSelectChannelConnector(sslContextFactory);
 +      connector = new ServerConnector(server, sslContextFactory);
        usingSsl = true;
      }