From commits-return-75337-archive-asf-public=cust-asf.ponee.io@hbase.apache.org  Wed Jul  4 04:57:34 2018
Return-Path: <commits-return-75337-archive-asf-public=cust-asf.ponee.io@hbase.apache.org>
X-Original-To: archive-asf-public@cust-asf.ponee.io
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by mx-eu-01.ponee.io (Postfix) with SMTP id 16431180632
	for <archive-asf-public@cust-asf.ponee.io>; Wed,  4 Jul 2018 04:57:33 +0200 (CEST)
Received: (qmail 60334 invoked by uid 500); 4 Jul 2018 02:57:33 -0000
Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hbase.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hbase.apache.org>
List-Post: <mailto:commits@hbase.apache.org>
List-Id: <commits.hbase.apache.org>
Reply-To: dev@hbase.apache.org
Delivered-To: mailing list commits@hbase.apache.org
Received: (qmail 60325 invoked by uid 99); 4 Jul 2018 02:57:33 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jul 2018 02:57:33 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 0E605E09EC; Wed,  4 Jul 2018 02:57:33 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: gxcheng@apache.org
To: commits@hbase.apache.org
Message-Id: <2f6f8fc0aa04412ab82b5ef930f16d37@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: hbase git commit: HBASE-20474 Show non-RPC tasks on
 master/regionserver Web UI by default
Date: Wed,  4 Jul 2018 02:57:33 +0000 (UTC)

Repository: hbase
Updated Branches:
  refs/heads/branch-2 5ef9d8f45 -> 341fa5536


HBASE-20474 Show non-RPC tasks on master/regionserver Web UI by default


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

Branch: refs/heads/branch-2
Commit: 341fa5536721349b15f6bf124c7db526f385ddbf
Parents: 5ef9d8f
Author: Guangxu Cheng <guangxucheng@gmail.com>
Authored: Mon Apr 23 11:23:17 2018 +0800
Committer: Guangxu Cheng <guangxucheng@gmail.com>
Committed: Wed Jul 4 10:56:46 2018 +0800

----------------------------------------------------------------------
 .../apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/341fa553/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon
index 79b1634..9f27d46 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon
@@ -34,10 +34,10 @@ String format = "html";
 
   <div class="tabbable">
       <ul class="nav nav-pills">
-        <li class="active">
+        <li class="">
             <a href="#tab_alltasks" data-toggle="tab">Show All Monitored Tasks</a>
         </li>
-        <li class="">
+        <li class="active">
             <a href="#tab_generaltasks" data-toggle="tab">Show non-RPC Tasks</a>
         </li>
         <li class="">
@@ -51,11 +51,11 @@ String format = "html";
         </li>
       </ul>
       <div class="tab-content" style="padding-bottom: 9px; border-bottom: 1px solid #ddd;">
-        <div class="tab-pane active" id="tab_alltasks">
+        <div class="tab-pane" id="tab_alltasks">
             <& jsonView; filter="all" &>
             <& renderTasks; filter="all" &>
         </div>
-        <div class="tab-pane" id="tab_generaltasks">
+        <div class="tab-pane active" id="tab_generaltasks">
             <& jsonView; filter="general" &>
             <& renderTasks; filter="general" &>
         </div>