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 97419179BF for ; Fri, 17 Apr 2015 22:30:48 +0000 (UTC) Received: (qmail 30389 invoked by uid 500); 17 Apr 2015 22:30:48 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 30291 invoked by uid 500); 17 Apr 2015 22:30:48 -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 30069 invoked by uid 99); 17 Apr 2015 22:30:48 -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; Fri, 17 Apr 2015 22:30:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 55378E0515; Fri, 17 Apr 2015 22:30:48 +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, 17 Apr 2015 22:30:52 -0000 Message-Id: In-Reply-To: <6adc9bb5d4024fb0a49d7da5d8b348ce@git.apache.org> References: <6adc9bb5d4024fb0a49d7da5d8b348ce@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/6] accumulo 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/85b30806 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/85b30806 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/85b30806 Branch: refs/heads/master Commit: 85b30806d3ef9a8a9828cb17e7dfbfb17a2995ae Parents: 29cc3dc 8b88ceb Author: Eric C. Newton Authored: Fri Apr 17 18:01:03 2015 -0400 Committer: Eric C. Newton Committed: Fri Apr 17 18:01:03 2015 -0400 ---------------------------------------------------------------------- .../accumulo/test/AccumuloOutputFormatTest.java | 114 +++++++++++++++++++ 1 file changed, 114 insertions(+) ----------------------------------------------------------------------