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 0334318641 for ; Thu, 8 Oct 2015 14:53:30 +0000 (UTC) Received: (qmail 28692 invoked by uid 500); 8 Oct 2015 14:53:20 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 28595 invoked by uid 500); 8 Oct 2015 14:53:20 -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 28576 invoked by uid 99); 8 Oct 2015 14:53:20 -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, 08 Oct 2015 14:53:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 53201E0BD0; Thu, 8 Oct 2015 14:53:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: afuchs@apache.org To: commits@accumulo.apache.org Date: Thu, 08 Oct 2015 14:53:21 -0000 Message-Id: <92315cf0da3e417cb025967e8bb66640@git.apache.org> In-Reply-To: <26c20dbe30c946babb3f0b0cf21eef05@git.apache.org> References: <26c20dbe30c946babb3f0b0cf21eef05@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/23a08473 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/23a08473 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/23a08473 Branch: refs/heads/master Commit: 23a084737774d8d26edb8d646831f52cd6251b65 Parents: 29c7eeb 8f37693 Author: Adam Fuchs Authored: Thu Oct 8 10:52:35 2015 -0400 Committer: Adam Fuchs Committed: Thu Oct 8 10:52:35 2015 -0400 ---------------------------------------------------------------------- proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ----------------------------------------------------------------------