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 ED1C610CCC for ; Tue, 24 Dec 2013 06:18:48 +0000 (UTC) Received: (qmail 50164 invoked by uid 500); 24 Dec 2013 06:18:44 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 49948 invoked by uid 500); 24 Dec 2013 06:18:38 -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 49846 invoked by uid 99); 24 Dec 2013 06:18:36 -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, 24 Dec 2013 06:18:36 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 60346918BF6; Tue, 24 Dec 2013 06:18:35 +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: Tue, 24 Dec 2013 06:18:41 -0000 Message-Id: <95718f3ac1244f6488e595dc9f07ba23@git.apache.org> In-Reply-To: <8e0bea1b03ad497987ff44fc8d382379@git.apache.org> References: <8e0bea1b03ad497987ff44fc8d382379@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/7] 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/00bcb0cb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/00bcb0cb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/00bcb0cb Branch: refs/heads/master Commit: 00bcb0cb0293f4902aecd7eba5bd4d6f121f9f60 Parents: 2d8a2ec db74696 Author: Keith Turner Authored: Tue Dec 24 01:19:13 2013 -0500 Committer: Keith Turner Committed: Tue Dec 24 01:19:13 2013 -0500 ---------------------------------------------------------------------- .../accumulo/core/client/impl/Tables.java | 22 ++++++++- .../org/apache/accumulo/tserver/Tablet.java | 51 +++++++++++--------- .../accumulo/test/randomwalk/bulk/Compact.java | 6 ++- .../accumulo/test/randomwalk/bulk/Split.java | 1 + .../randomwalk/concurrent/DeleteNamespace.java | 3 ++ .../test/randomwalk/security/TableOp.java | 46 ++++++++++-------- 6 files changed, 82 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/00bcb0cb/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java ----------------------------------------------------------------------