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 A166018339 for ; Tue, 26 May 2015 17:05:22 +0000 (UTC) Received: (qmail 36247 invoked by uid 500); 26 May 2015 17:05:22 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 36146 invoked by uid 500); 26 May 2015 17:05:22 -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 36130 invoked by uid 99); 26 May 2015 17:05:22 -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; Tue, 26 May 2015 17:05:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 52898E083A; Tue, 26 May 2015 17:05:22 +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: Tue, 26 May 2015 17:05:23 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] 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/56e211ae Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/56e211ae Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/56e211ae Branch: refs/heads/master Commit: 56e211ae64542f17a5822ecdfb86f9cb358dcfd2 Parents: 1c33be2 f453eca Author: Eric C. Newton Authored: Tue May 26 13:05:15 2015 -0400 Committer: Eric C. Newton Committed: Tue May 26 13:05:15 2015 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/monitor/Monitor.java | 22 ++++++++++++++++++++ .../accumulo/monitor/servlets/BasicServlet.java | 22 ++------------------ 2 files changed, 24 insertions(+), 20 deletions(-) ----------------------------------------------------------------------