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 7E02B11667 for ; Fri, 19 Sep 2014 22:23:15 +0000 (UTC) Received: (qmail 70488 invoked by uid 500); 19 Sep 2014 22:23:15 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 70440 invoked by uid 500); 19 Sep 2014 22:23:15 -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 70354 invoked by uid 99); 19 Sep 2014 22:23:15 -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, 19 Sep 2014 22:23:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2427DA1EFFF; Fri, 19 Sep 2014 22:23:15 +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: Fri, 19 Sep 2014 22:23:17 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/4] git commit: Merge branch '1.5.3-SNAPSHOT' into 1.6.1-SNAPSHOT Merge branch '1.5.3-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8959d264 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8959d264 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8959d264 Branch: refs/heads/1.6.1-SNAPSHOT Commit: 8959d264634315d3e9c4b45f8f9832b429183798 Parents: fbcf2f5 ad1c807 Author: Keith Turner Authored: Fri Sep 19 17:27:09 2014 -0400 Committer: Keith Turner Committed: Fri Sep 19 17:27:09 2014 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/tserver/Tablet.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) ----------------------------------------------------------------------