Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B2A4A18960 for ; Fri, 24 Apr 2015 23:20:48 +0000 (UTC) Received: (qmail 32005 invoked by uid 500); 24 Apr 2015 23:20:48 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 31875 invoked by uid 500); 24 Apr 2015 23:20:48 -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 31109 invoked by uid 99); 24 Apr 2015 23:20:48 -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; Fri, 24 Apr 2015 23:20:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1C2A4E1090; Fri, 24 Apr 2015 23:20:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Fri, 24 Apr 2015 23:21:00 -0000 Message-Id: <39072de02f2147cc96c335515fda076a@git.apache.org> In-Reply-To: <11fdb148eaf74d94adaf4c8d004a2058@git.apache.org> References: <11fdb148eaf74d94adaf4c8d004a2058@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/34] accumulo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/daa38ce9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/daa38ce9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/daa38ce9 Branch: refs/heads/master Commit: daa38ce90f41d12aa28607963e8c512f1f049522 Parents: 34af43f 4ca3143 Author: Eric C. Newton Authored: Mon Mar 23 12:53:50 2015 -0400 Committer: Eric C. Newton Committed: Mon Mar 23 12:53:50 2015 -0400 ---------------------------------------------------------------------- .../accumulo/monitor/servlets/trace/Basic.java | 85 +++++++++++++++----- .../monitor/servlets/trace/ListType.java | 26 +++++- .../monitor/servlets/trace/ShowTrace.java | 30 +++++-- .../monitor/servlets/trace/Summary.java | 34 +++++--- .../org/apache/accumulo/tracer/TraceServer.java | 31 ++++++- 5 files changed, 164 insertions(+), 42 deletions(-) ----------------------------------------------------------------------