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 8A43D10772 for ; Fri, 21 Mar 2014 18:56:45 +0000 (UTC) Received: (qmail 66564 invoked by uid 500); 21 Mar 2014 18:56:45 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 66468 invoked by uid 500); 21 Mar 2014 18:56:43 -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 66316 invoked by uid 99); 21 Mar 2014 18:56:41 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Mar 2014 18:56:41 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 280AC32BA84; Fri, 21 Mar 2014 18:56:41 +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: Fri, 21 Mar 2014 18:56:43 -0000 Message-Id: <6ac1142102fd4ffebb2cf8db8c4708a8@git.apache.org> In-Reply-To: <5b0515c4a32144f5a84f026561f0a989@git.apache.org> References: <5b0515c4a32144f5a84f026561f0a989@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/8] git commit: Merge branch '1.6.0-SNAPSHOT' Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/151fcb6d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/151fcb6d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/151fcb6d Branch: refs/heads/master Commit: 151fcb6dcad54a9542711e1c73d1319a2b74186f Parents: 1429eca d7f5b9e Author: Eric C. Newton Authored: Fri Mar 21 14:51:53 2014 -0400 Committer: Eric C. Newton Committed: Fri Mar 21 14:51:53 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/proxy/SimpleProxyIT.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) ----------------------------------------------------------------------