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 8111C11E85 for ; Fri, 12 Sep 2014 08:01:47 +0000 (UTC) Received: (qmail 72984 invoked by uid 500); 12 Sep 2014 08:01:47 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 72949 invoked by uid 500); 12 Sep 2014 08:01:47 -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 72940 invoked by uid 99); 12 Sep 2014 08:01:47 -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, 12 Sep 2014 08:01:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0DFF09BFD96; Fri, 12 Sep 2014 08:01:47 +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: Fri, 12 Sep 2014 08:01:48 -0000 Message-Id: <512bc5311ed64d99ba6f747494be84fc@git.apache.org> In-Reply-To: <918b8e15441f428da311a45555efd131@git.apache.org> References: <918b8e15441f428da311a45555efd131@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch '1.6.1-SNAPSHOT' Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25ab9c64 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25ab9c64 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/25ab9c64 Branch: refs/heads/master Commit: 25ab9c645ba0b62908077feff2dba3a0ddb92582 Parents: 6b5275e 2519b83 Author: Josh Elser Authored: Fri Sep 12 00:47:50 2014 -0700 Committer: Josh Elser Committed: Fri Sep 12 00:47:50 2014 -0700 ---------------------------------------------------------------------- .../apache/accumulo/test/ConditionalWriterIT.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/25ab9c64/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java ----------------------------------------------------------------------