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 B1C3811560 for ; Thu, 11 Sep 2014 06:30:35 +0000 (UTC) Received: (qmail 7888 invoked by uid 500); 11 Sep 2014 06:30:35 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 7842 invoked by uid 500); 11 Sep 2014 06:30: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 7756 invoked by uid 99); 11 Sep 2014 06:30: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; Thu, 11 Sep 2014 06:30:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2469790E8ED; Thu, 11 Sep 2014 06:30:35 +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: Thu, 11 Sep 2014 06:30:40 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [7/8] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/560c2688 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/560c2688 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/560c2688 Branch: refs/heads/1.6.1-SNAPSHOT Commit: 560c268828417498e04b135bff4994c35efe2539 Parents: a9ea7a9 c335fca Author: Josh Elser Authored: Wed Sep 10 23:15:52 2014 -0700 Committer: Josh Elser Committed: Wed Sep 10 23:15:52 2014 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/tserver/TabletServer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------