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 19AF3105D5 for ; Wed, 3 Jun 2015 03:17:31 +0000 (UTC) Received: (qmail 15500 invoked by uid 500); 3 Jun 2015 03:17:31 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 15468 invoked by uid 500); 3 Jun 2015 03:17:31 -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 15388 invoked by uid 99); 3 Jun 2015 03:17:31 -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; Wed, 03 Jun 2015 03:17:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D8C01E04AC; Wed, 3 Jun 2015 03:17:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: billie@apache.org To: commits@accumulo.apache.org Date: Wed, 03 Jun 2015 03:17:31 -0000 Message-Id: <96cf036ea575442da3f13a31718b89a8@git.apache.org> In-Reply-To: <2dae97eaeae7488990261c8aebfdf164@git.apache.org> References: <2dae97eaeae7488990261c8aebfdf164@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] accumulo git commit: Merge branch '1.7' Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e6e85cfa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e6e85cfa Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e6e85cfa Branch: refs/heads/master Commit: e6e85cfa1e50b094d4111f4a0a66de68f112c0fe Parents: 3d9336b c475af0 Author: Billie Rinaldi Authored: Tue Jun 2 20:17:11 2015 -0700 Committer: Billie Rinaldi Committed: Tue Jun 2 20:17:11 2015 -0700 ---------------------------------------------------------------------- .../test/java/org/apache/accumulo/test/TransportCachingIT.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ----------------------------------------------------------------------