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 D968817AA6 for ; Thu, 23 Apr 2015 16:03:39 +0000 (UTC) Received: (qmail 95069 invoked by uid 500); 23 Apr 2015 16:03:39 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 95010 invoked by uid 500); 23 Apr 2015 16:03:39 -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 94717 invoked by uid 99); 23 Apr 2015 16:03:39 -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, 23 Apr 2015 16:03:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8A0AAE17BF; Thu, 23 Apr 2015 16:03:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Thu, 23 Apr 2015 16:03:43 -0000 Message-Id: In-Reply-To: <70fac79fa98a445c976a055581e1f9f0@git.apache.org> References: <70fac79fa98a445c976a055581e1f9f0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/7] 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/72bacc88 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/72bacc88 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/72bacc88 Branch: refs/heads/master Commit: 72bacc8832375b803abf047417dd64e60d364fb4 Parents: 489c927 f41a253 Author: Eric Newton Authored: Thu Apr 23 12:02:32 2015 -0400 Committer: Eric Newton Committed: Thu Apr 23 12:02:32 2015 -0400 ---------------------------------------------------------------------- .../src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------