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 65360110B0 for ; Wed, 17 Sep 2014 04:57:51 +0000 (UTC) Received: (qmail 61493 invoked by uid 500); 17 Sep 2014 04:57:51 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 61397 invoked by uid 500); 17 Sep 2014 04:57:51 -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 61307 invoked by uid 99); 17 Sep 2014 04:57:51 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Sep 2014 04:57:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0AB90A17C01; Wed, 17 Sep 2014 04:57:51 +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: Wed, 17 Sep 2014 04:57:52 -0000 Message-Id: <16e5b7d9287547a5aaade82c592c27d3@git.apache.org> In-Reply-To: <364f3459829445a7b6fadd3a6485594c@git.apache.org> References: <364f3459829445a7b6fadd3a6485594c@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/edc9c30c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/edc9c30c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/edc9c30c Branch: refs/heads/master Commit: edc9c30ce604aff6000530dc970c785566379979 Parents: 503f104 3e4d07b Author: Josh Elser Authored: Wed Sep 17 00:57:05 2014 -0400 Committer: Josh Elser Committed: Wed Sep 17 00:57:05 2014 -0400 ---------------------------------------------------------------------- .../test/functional/AccumuloInputFormatIT.java | 21 ++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) ----------------------------------------------------------------------