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 DDE0910191 for ; Sat, 23 Nov 2013 01:41:56 +0000 (UTC) Received: (qmail 19019 invoked by uid 500); 23 Nov 2013 01:41:56 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 18684 invoked by uid 500); 23 Nov 2013 01:41:55 -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 18437 invoked by uid 99); 23 Nov 2013 01:41:54 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Nov 2013 01:41:54 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 91640902A92; Sat, 23 Nov 2013 01:41:54 +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: Sat, 23 Nov 2013 01:42:06 -0000 Message-Id: In-Reply-To: <05f71fc0259046c792a7f8a2460da513@git.apache.org> References: <05f71fc0259046c792a7f8a2460da513@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/19] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into ACCUMULO-1854-1.5-merge Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into ACCUMULO-1854-1.5-merge Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4f098247 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4f098247 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4f098247 Branch: refs/heads/1.5.1-SNAPSHOT Commit: 4f0982473451815264da8c8d919424787fbf3122 Parents: 03b065d 7eaedc4 Author: Josh Elser Authored: Fri Nov 22 13:00:47 2013 -0500 Committer: Josh Elser Committed: Fri Nov 22 13:00:47 2013 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/server/util/MetadataTable.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ----------------------------------------------------------------------