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 09368100B8 for ; Tue, 26 May 2015 20:57:22 +0000 (UTC) Received: (qmail 48942 invoked by uid 500); 26 May 2015 20:57:21 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 48849 invoked by uid 500); 26 May 2015 20:57:21 -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 48658 invoked by uid 99); 26 May 2015 20:57:21 -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 20:57:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 829F1E0A42; Tue, 26 May 2015 20:57:21 +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: Tue, 26 May 2015 20:57:26 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] accumulo git commit: Merge branch '1.7' Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ca5928e2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ca5928e2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ca5928e2 Branch: refs/heads/master Commit: ca5928e2089139cda395a82d3d201d3aab1d3231 Parents: fdd7d09 07672bd Author: Christopher Tubbs Authored: Tue May 26 16:45:33 2015 -0400 Committer: Christopher Tubbs Committed: Tue May 26 16:45:33 2015 -0400 ---------------------------------------------------------------------- .../accumulo/monitor/EmbeddedWebServer.java | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) ----------------------------------------------------------------------