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 D869D17E54 for ; Fri, 13 Feb 2015 03:28:46 +0000 (UTC) Received: (qmail 17400 invoked by uid 500); 13 Feb 2015 03:28:12 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 16571 invoked by uid 500); 13 Feb 2015 03:28:12 -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 16374 invoked by uid 99); 13 Feb 2015 03:28:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Feb 2015 03:28:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EC42EE05D3; Fri, 13 Feb 2015 03:28:10 +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: Fri, 13 Feb 2015 03:28:13 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/9] accumulo git commit: Merge branch '1.5' into 1.6 Merge branch '1.5' into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6111043f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6111043f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6111043f Branch: refs/heads/1.6 Commit: 6111043f3fb84ecd28dd91b7be6956eff11ce675 Parents: 94b12f1 bd981c8 Author: Josh Elser Authored: Thu Feb 12 19:18:30 2015 -0500 Committer: Josh Elser Committed: Thu Feb 12 19:18:30 2015 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/core/client/impl/ThriftTransportPool.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6111043f/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java ----------------------------------------------------------------------