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 E6A5D17792 for ; Thu, 12 Feb 2015 23:39:30 +0000 (UTC) Received: (qmail 18475 invoked by uid 500); 12 Feb 2015 23:39:24 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 18380 invoked by uid 500); 12 Feb 2015 23:39:24 -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 18037 invoked by uid 99); 12 Feb 2015 23:39:24 -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, 12 Feb 2015 23:39:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3CB84E07D9; Thu, 12 Feb 2015 23:39:24 +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, 12 Feb 2015 23:39:33 -0000 Message-Id: <93200efad9d647a4b3e4f3d5a79a9112@git.apache.org> In-Reply-To: <2d94ca6c18bd400e8ea423a89fd35601@git.apache.org> References: <2d94ca6c18bd400e8ea423a89fd35601@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/11] accumulo git commit: Merge remote-tracking branch 'origin/1.6' into 1.6 Merge remote-tracking branch 'origin/1.6' into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/94b12f1e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/94b12f1e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/94b12f1e Branch: refs/heads/master Commit: 94b12f1e3415423ab0c0af1b50417c23fd295e12 Parents: 8460ec9 6b12b47 Author: Christopher Tubbs Authored: Thu Feb 12 18:13:17 2015 -0500 Committer: Christopher Tubbs Committed: Thu Feb 12 18:13:17 2015 -0500 ---------------------------------------------------------------------- .../accumulo/server/util/TableDiskUsage.java | 29 +++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) ----------------------------------------------------------------------