Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EF581200B35 for ; Tue, 21 Jun 2016 05:39:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id EE1C5160A66; Tue, 21 Jun 2016 03:39:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 68188160A55 for ; Tue, 21 Jun 2016 05:39:55 +0200 (CEST) Received: (qmail 12541 invoked by uid 500); 21 Jun 2016 03:39:53 -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 11775 invoked by uid 99); 21 Jun 2016 03:39:51 -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; Tue, 21 Jun 2016 03:39:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4D6E4ED312; Tue, 21 Jun 2016 03:39:51 +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: Tue, 21 Jun 2016 03:40:02 -0000 Message-Id: In-Reply-To: <1e6de167d71b4f33881452e96aeca8ff@git.apache.org> References: <1e6de167d71b4f33881452e96aeca8ff@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/28] accumulo git commit: Merge branch '1.8' archived-at: Tue, 21 Jun 2016 03:39:56 -0000 Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bfc2a5b7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bfc2a5b7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bfc2a5b7 Branch: refs/heads/master Commit: bfc2a5b7b2dbb452436074529cbdd1b32ab955a9 Parents: 5c576af a24a286 Author: Josh Elser Authored: Mon Jun 20 22:38:32 2016 -0400 Committer: Josh Elser Committed: Mon Jun 20 22:38:32 2016 -0400 ---------------------------------------------------------------------- .../accumulo/core/rpc/TTimeoutTransport.java | 24 ++++++++++++++------ .../apache/accumulo/core/rpc/ThriftUtil.java | 8 ++++++- .../accumulo/server/util/TServerUtilsTest.java | 19 ++++++++++------ 3 files changed, 36 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/bfc2a5b7/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java ----------------------------------------------------------------------