Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7448D200BDE for ; Thu, 10 Nov 2016 23:18:43 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 710A3160B14; Thu, 10 Nov 2016 22:18:43 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C3DEE160AF7 for ; Thu, 10 Nov 2016 23:18:42 +0100 (CET) Received: (qmail 53839 invoked by uid 500); 10 Nov 2016 22:18:42 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 53781 invoked by uid 99); 10 Nov 2016 22:18:41 -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; Thu, 10 Nov 2016 22:18:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B022DEEE30; Thu, 10 Nov 2016 22:18:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Thu, 10 Nov 2016 22:18:47 -0000 Message-Id: <57140d3e69c646e59a5b97ec4166b885@git.apache.org> In-Reply-To: <01eeecd04f294b1eb8ceadf8eb357f5b@git.apache.org> References: <01eeecd04f294b1eb8ceadf8eb357f5b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/7] accumulo git commit: Merge branch 'pr-175' archived-at: Thu, 10 Nov 2016 22:18:43 -0000 Merge branch 'pr-175' Signed-off-by: Christopher Tubbs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e2d21fc9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e2d21fc9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e2d21fc9 Branch: refs/heads/master Commit: e2d21fc9267a9335539daa3f94d30ced78726622 Parents: b5d7c18 0f2d022 Author: Christopher Tubbs Authored: Thu Nov 10 16:51:47 2016 -0500 Committer: Christopher Tubbs Committed: Thu Nov 10 16:52:01 2016 -0500 ---------------------------------------------------------------------- .../monitor/servlets/MasterServlet.java | 3 ++ .../monitor/servlets/OperationServlet.java | 15 ++++++ .../monitor/servlets/TablesServlet.java | 32 ++++++++++++- .../org/apache/accumulo/monitor/util/Table.java | 49 +++++++++++++++++++- .../monitor/src/main/resources/web/screen.css | 37 +++++++++++++++ 5 files changed, 132 insertions(+), 4 deletions(-) ----------------------------------------------------------------------