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 3946610674 for ; Wed, 5 Mar 2014 03:49:17 +0000 (UTC) Received: (qmail 3906 invoked by uid 500); 5 Mar 2014 03:49:16 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 3856 invoked by uid 500); 5 Mar 2014 03:49:14 -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 3674 invoked by uid 99); 5 Mar 2014 03:49:10 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Mar 2014 03:49:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BB3E99367A0; Wed, 5 Mar 2014 03:49:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kturner@apache.org To: commits@accumulo.apache.org Date: Wed, 05 Mar 2014 03:49:12 -0000 Message-Id: In-Reply-To: <638fd6d53a5b4cc3ba39cdcb1cc6c769@git.apache.org> References: <638fd6d53a5b4cc3ba39cdcb1cc6c769@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/5] git commit: Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT' Merge remote-tracking branch 'origin/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/ecc4315c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ecc4315c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ecc4315c Branch: refs/heads/master Commit: ecc4315c88e8b9de796a498910b198491ae1b001 Parents: fa34e04 45d2110 Author: Keith Turner Authored: Tue Mar 4 22:50:36 2014 -0500 Committer: Keith Turner Committed: Tue Mar 4 22:50:36 2014 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/tserver/RootFiles.java | 135 +++++++++++++++++ .../org/apache/accumulo/tserver/Tablet.java | 80 +--------- .../apache/accumulo/tserver/RootFilesTest.java | 147 +++++++++++++++++++ 3 files changed, 285 insertions(+), 77 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/ecc4315c/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java ----------------------------------------------------------------------