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 B926110D12 for ; Fri, 8 Nov 2013 15:55:55 +0000 (UTC) Received: (qmail 47162 invoked by uid 500); 8 Nov 2013 15:55:53 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 47031 invoked by uid 500); 8 Nov 2013 15:55:44 -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 46836 invoked by uid 99); 8 Nov 2013 15:55:41 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Nov 2013 15:55:41 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5F51D815CED; Fri, 8 Nov 2013 15:55:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vines@apache.org To: commits@accumulo.apache.org Date: Fri, 08 Nov 2013 15:55:48 -0000 Message-Id: <35d66ae0f9894646b2e1bd377c845f64@git.apache.org> In-Reply-To: <616184073348454b8ed70280d955ba1b@git.apache.org> References: <616184073348454b8ed70280d955ba1b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [8/8] git commit: Merge branch '1.6.0-SNAPSHOT' Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c00ac628 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c00ac628 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c00ac628 Branch: refs/heads/master Commit: c00ac6287593e06a6998f4f62b287be197baacdf Parents: ddde450 fdc6c62 Author: John Vines Authored: Fri Nov 8 10:54:38 2013 -0500 Committer: John Vines Committed: Fri Nov 8 10:54:38 2013 -0500 ---------------------------------------------------------------------- core/pom.xml | 14 +-- examples/simple/pom.xml | 18 +-- maven-plugin/pom.xml | 58 ++-------- maven-plugin/src/it/plugin-test/pom.xml | 5 + minicluster/pom.xml | 34 +++--- pom.xml | 15 +++ proxy/pom.xml | 14 +-- server/base/pom.xml | 22 +--- .../security/AuditedSecurityOperation.java | 6 +- .../accumulo/server/util/TableDiskUsage.java | 110 +++++++++---------- server/extras/pom.xml | 30 ++++- server/gc/pom.xml | 39 +++++++ server/master/pom.xml | 44 ++++++++ server/monitor/pom.xml | 57 ++++++++++ server/tracer/pom.xml | 36 +++++- server/tserver/pom.xml | 78 +++++++++++++ start/pom.xml | 10 -- test/pom.xml | 46 ++++---- .../randomwalk/conf/modules/Conditional.xml | 4 +- trace/pom.xml | 5 - 20 files changed, 423 insertions(+), 222 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/examples/simple/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/maven-plugin/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/minicluster/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/proxy/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/server/base/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/server/extras/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/server/gc/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/server/master/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/server/monitor/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/server/tracer/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/server/tserver/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/start/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/test/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c00ac628/trace/pom.xml ----------------------------------------------------------------------