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 2376217CA4 for ; Mon, 27 Apr 2015 17:47:03 +0000 (UTC) Received: (qmail 50677 invoked by uid 500); 27 Apr 2015 17:47:03 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 50576 invoked by uid 500); 27 Apr 2015 17:47: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 50542 invoked by uid 99); 27 Apr 2015 17:47:02 -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, 27 Apr 2015 17:47:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D086AE17C0; Mon, 27 Apr 2015 17:47:02 +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: Mon, 27 Apr 2015 17:47:03 -0000 Message-Id: In-Reply-To: <95d2d78a586b42438036f5f16274de5b@git.apache.org> References: <95d2d78a586b42438036f5f16274de5b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] 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/f442676c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f442676c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f442676c Branch: refs/heads/master Commit: f442676ca341c650b109762208bf4ce7c0b7aaa3 Parents: 488f441 951257a Author: Eric C. Newton Authored: Mon Apr 27 13:46:14 2015 -0400 Committer: Eric C. Newton Committed: Mon Apr 27 13:46:14 2015 -0400 ---------------------------------------------------------------------- test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f442676c/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java ----------------------------------------------------------------------