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 1575B200B3B for ; Mon, 11 Jul 2016 21:05:33 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 140FC160A8A; Mon, 11 Jul 2016 19:05:33 +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 53112160A5E for ; Mon, 11 Jul 2016 21:05:32 +0200 (CEST) Received: (qmail 93785 invoked by uid 500); 11 Jul 2016 19:05: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 93768 invoked by uid 99); 11 Jul 2016 19:05: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; Mon, 11 Jul 2016 19:05:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 173E2DFFC0; Mon, 11 Jul 2016 19:05:31 +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: Mon, 11 Jul 2016 19:05:37 -0000 Message-Id: <8d828e600d004bf187c7adc88c4f2f66@git.apache.org> In-Reply-To: <4c2010522caf44b89bf820cd9b9d5ecc@git.apache.org> References: <4c2010522caf44b89bf820cd9b9d5ecc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/8] accumulo git commit: Merge branch '1.7' into 1.8 archived-at: Mon, 11 Jul 2016 19:05:33 -0000 Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/757dedf7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/757dedf7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/757dedf7 Branch: refs/heads/1.8 Commit: 757dedf7aa3fe314a3b8f772261d06d10ef1a152 Parents: c12679a b70b528 Author: Josh Elser Authored: Mon Jul 11 14:41:53 2016 -0400 Committer: Josh Elser Committed: Mon Jul 11 14:41:53 2016 -0400 ---------------------------------------------------------------------- .../accumulo/test/proxy/SimpleProxyBase.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) ----------------------------------------------------------------------