HBASE-15812 HttpServer fails to come up against hadoop trunk
This commit is contained in:
parent
c9ebcd4e29
commit
f3fee82ac4
|
@ -58,7 +58,6 @@ import org.apache.hadoop.hbase.http.jmx.JMXJsonServlet;
|
||||||
import org.apache.hadoop.hbase.http.log.LogLevel;
|
import org.apache.hadoop.hbase.http.log.LogLevel;
|
||||||
import org.apache.hadoop.hbase.util.Threads;
|
import org.apache.hadoop.hbase.util.Threads;
|
||||||
import org.apache.hadoop.hbase.util.ReflectionUtils;
|
import org.apache.hadoop.hbase.util.ReflectionUtils;
|
||||||
import org.apache.hadoop.metrics.MetricsServlet;
|
|
||||||
import org.apache.hadoop.security.SecurityUtil;
|
import org.apache.hadoop.security.SecurityUtil;
|
||||||
import org.apache.hadoop.security.UserGroupInformation;
|
import org.apache.hadoop.security.UserGroupInformation;
|
||||||
import org.apache.hadoop.security.authentication.server.AuthenticationFilter;
|
import org.apache.hadoop.security.authentication.server.AuthenticationFilter;
|
||||||
|
@ -676,7 +675,6 @@ public class HttpServer implements FilterContainer {
|
||||||
// set up default servlets
|
// set up default servlets
|
||||||
addServlet("stacks", "/stacks", StackServlet.class);
|
addServlet("stacks", "/stacks", StackServlet.class);
|
||||||
addServlet("logLevel", "/logLevel", LogLevel.Servlet.class);
|
addServlet("logLevel", "/logLevel", LogLevel.Servlet.class);
|
||||||
addServlet("metrics", "/metrics", MetricsServlet.class);
|
|
||||||
addServlet("jmx", "/jmx", JMXJsonServlet.class);
|
addServlet("jmx", "/jmx", JMXJsonServlet.class);
|
||||||
addServlet("conf", "/conf", ConfServlet.class);
|
addServlet("conf", "/conf", ConfServlet.class);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue