[4/4] git commit: Merge branch '1.6.1-SNAPSHOT'

[elserj]

Merge branch '1.6.1-SNAPSHOT'

Conflicts:
        
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/ab6871e1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ab6871e1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ab6871e1

Branch: refs/heads/master
Commit: ab6871e1635033cc160923bc90334eb3d6848b87
Parents: 02dee23 290866f
Author: Josh Elser <els...@apache.org>
Authored: Thu Aug 7 17:08:23 2014 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Thu Aug 7 17:08:23 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/core/util/SslConnectionParams.java | 2 +-
 .../java/org/apache/accumulo/server/fs/VolumeManagerImpl.java   | 5 ++---
 .../java/org/apache/accumulo/monitor/EmbeddedWebServer.java     | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab6871e1/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab6871e1/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 0ff914a,82cd436..18ef4e1
--- 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
+++ 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
@@@ -20,11 -20,11 +20,11 @@@ import javax.servlet.http.HttpServlet
  
  import org.apache.accumulo.core.conf.AccumuloConfiguration;
  import org.apache.accumulo.core.conf.Property;
- import org.apache.hadoop.util.StringUtils;
+ import org.apache.commons.lang.StringUtils;
 +import org.eclipse.jetty.server.HttpConnectionFactory;
  import org.eclipse.jetty.server.Server;
 -import org.eclipse.jetty.server.nio.SelectChannelConnector;
 +import org.eclipse.jetty.server.ServerConnector;
  import org.eclipse.jetty.server.session.SessionHandler;
 -import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
  import org.eclipse.jetty.servlet.ServletContextHandler;
  import org.eclipse.jetty.util.ssl.SslContextFactory;