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

[ctubbsii]

Merge branch '1.6' into 1.7

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

Branch: refs/heads/master
Commit: 07672bdc3bae59165bcd408bab2082332312b1d6
Parents: 829f46d de2763e
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Tue May 26 16:19:01 2015 -0400
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Tue May 26 16:19:01 2015 -0400

----------------------------------------------------------------------
 .../accumulo/monitor/EmbeddedWebServer.java     | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/07672bdc/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 8c23a16,41890e8..f0213e7
--- 
a/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
+++ 
b/server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
@@@ -21,11 -21,14 +21,14 @@@ import javax.servlet.http.HttpServlet
  import org.apache.accumulo.core.conf.AccumuloConfiguration;
  import org.apache.accumulo.core.conf.Property;
  import org.apache.commons.lang.StringUtils;
+ import org.eclipse.jetty.security.ConstraintMapping;
+ import org.eclipse.jetty.security.ConstraintSecurityHandler;
 +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.security.Constraint;
  import org.eclipse.jetty.util.ssl.SslContextFactory;
  
  public class EmbeddedWebServer {