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 A9A2A10AB6 for ; Tue, 8 Apr 2014 03:04:12 +0000 (UTC) Received: (qmail 38123 invoked by uid 500); 8 Apr 2014 03:03:28 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 37531 invoked by uid 500); 8 Apr 2014 03:03:10 -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 37247 invoked by uid 99); 8 Apr 2014 03:03:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Apr 2014 03:03:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2EB5494D794; Tue, 8 Apr 2014 03:03:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Tue, 08 Apr 2014 03:03:12 -0000 Message-Id: <4f71c33e8e5d4c2caa9111048c7ba01d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [16/53] [abbrv] 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/24f895f3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/24f895f3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/24f895f3 Branch: refs/heads/ACCUMULO-378 Commit: 24f895f374e03d60e305bc67b03116c02a5caab4 Parents: bcc9e7e 88f24d2 Author: Bill Havanki Authored: Mon Apr 7 17:14:09 2014 -0400 Committer: Bill Havanki Committed: Mon Apr 7 17:14:09 2014 -0400 ---------------------------------------------------------------------- server/gc/pom.xml | 5 + .../gc/GarbageCollectWriteAheadLogs.java | 89 ++++++- .../accumulo/gc/SimpleGarbageCollector.java | 134 +++++++++- .../gc/GarbageCollectWriteAheadLogsTest.java | 264 +++++++++++++++++++ .../gc/SimpleGarbageCollectorOptsTest.java | 37 +++ .../accumulo/gc/SimpleGarbageCollectorTest.java | 146 ++++++++++ 6 files changed, 657 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/24f895f3/server/gc/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/24f895f3/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java ----------------------------------------------------------------------