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 806DE11CE8 for ; Fri, 4 Apr 2014 02:01:42 +0000 (UTC) Received: (qmail 30635 invoked by uid 500); 4 Apr 2014 02:01:39 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 30466 invoked by uid 500); 4 Apr 2014 02:01:35 -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 30405 invoked by uid 99); 4 Apr 2014 02:01:35 -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, 04 Apr 2014 02:01:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A483A93DA5D; Fri, 4 Apr 2014 02:01:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mdrob@apache.org To: commits@accumulo.apache.org Date: Fri, 04 Apr 2014 02:01:39 -0000 Message-Id: In-Reply-To: <673ae80f456f4290aa6aabf7c1686fff@git.apache.org> References: <673ae80f456f4290aa6aabf7c1686fff@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] 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/4e3696f1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4e3696f1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4e3696f1 Branch: refs/heads/master Commit: 4e3696f133b4b02dbdba1af699c67bf3f999f9ac Parents: 61de680 b3f6e0f Author: Mike Drob Authored: Thu Apr 3 18:57:10 2014 -0700 Committer: Mike Drob Committed: Thu Apr 3 18:57:10 2014 -0700 ---------------------------------------------------------------------- .../java/org/apache/accumulo/tserver/InMemoryMap.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) ----------------------------------------------------------------------