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 08B5E17C2C for ; Fri, 31 Oct 2014 22:45:35 +0000 (UTC) Received: (qmail 26204 invoked by uid 500); 31 Oct 2014 22:45:30 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 26099 invoked by uid 500); 31 Oct 2014 22:45:29 -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 26009 invoked by uid 99); 31 Oct 2014 22:45:29 -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, 31 Oct 2014 22:45:29 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A8EE692A88A; Fri, 31 Oct 2014 22:45:29 +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, 31 Oct 2014 22:45:31 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch '1.6' Merge branch '1.6' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eca6022f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eca6022f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eca6022f Branch: refs/heads/master Commit: eca6022f823d264bd4cf60f3f6ef8ae86cb98ae7 Parents: 0c51290 09a4f0a Author: Josh Elser Authored: Fri Oct 31 18:45:19 2014 -0400 Committer: Josh Elser Committed: Fri Oct 31 18:45:19 2014 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/test/ConditionalWriterIT.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/eca6022f/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java ----------------------------------------------------------------------