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 F039C18B03 for ; Thu, 28 May 2015 18:10:03 +0000 (UTC) Received: (qmail 78502 invoked by uid 500); 28 May 2015 18:10:03 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 78429 invoked by uid 500); 28 May 2015 18:10:03 -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 78387 invoked by uid 99); 28 May 2015 18:10:03 -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; Thu, 28 May 2015 18:10:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A036AE10F1; Thu, 28 May 2015 18:10:03 +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, 28 May 2015 18:10:07 -0000 Message-Id: In-Reply-To: <69cde529b51845c892bd4a3af6b933f6@git.apache.org> References: <69cde529b51845c892bd4a3af6b933f6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/10] 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/244eeb67 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/244eeb67 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/244eeb67 Branch: refs/heads/1.7 Commit: 244eeb671b7fef7c682151a1f8c227ff1f39b673 Parents: 0cf5b9c 362b8ac Author: Josh Elser Authored: Thu May 28 14:09:33 2015 -0400 Committer: Josh Elser Committed: Thu May 28 14:09:33 2015 -0400 ---------------------------------------------------------------------- .../test/java/org/apache/accumulo/proxy/ProxyServerTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------