You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ec...@apache.org on 2016/05/13 21:37:03 UTC

[09/50] [abbrv] hbase git commit: HBASE-15812 HttpServer fails to come up against hadoop trunk

HBASE-15812 HttpServer fails to come up against hadoop trunk


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

Branch: refs/heads/HBASE-14850
Commit: f3fee82ac42228d3c87353508fbd06d28e6414be
Parents: c9ebcd4
Author: tedyu <yu...@gmail.com>
Authored: Wed May 11 09:00:27 2016 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Wed May 11 09:00:27 2016 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/hbase/http/HttpServer.java     | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/f3fee82a/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java
index 667e597..154ecf5 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java
@@ -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.util.Threads;
 import org.apache.hadoop.hbase.util.ReflectionUtils;
-import org.apache.hadoop.metrics.MetricsServlet;
 import org.apache.hadoop.security.SecurityUtil;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.authentication.server.AuthenticationFilter;
@@ -676,7 +675,6 @@ public class HttpServer implements FilterContainer {
     // set up default servlets
     addServlet("stacks", "/stacks", StackServlet.class);
     addServlet("logLevel", "/logLevel", LogLevel.Servlet.class);
-    addServlet("metrics", "/metrics", MetricsServlet.class);
     addServlet("jmx", "/jmx", JMXJsonServlet.class);
     addServlet("conf", "/conf", ConfServlet.class);
   }