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 BEB511040D for ; Fri, 13 Jun 2014 02:36:23 +0000 (UTC) Received: (qmail 20500 invoked by uid 500); 13 Jun 2014 02:36:23 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 20382 invoked by uid 500); 13 Jun 2014 02:36:23 -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 20086 invoked by uid 99); 13 Jun 2014 02:36:23 -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, 13 Jun 2014 02:36:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3F369932349; Fri, 13 Jun 2014 02:36:23 +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, 13 Jun 2014 02:36:31 -0000 Message-Id: <64b913604d924d8f98a30f3be3e0f36a@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [9/9] 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/5e447805 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5e447805 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5e447805 Branch: refs/heads/master Commit: 5e4478057533d349be9c53312fd2a1d9787b9834 Parents: 7d639d8 ab4ecfc Author: Josh Elser Authored: Thu Jun 12 22:35:17 2014 -0400 Committer: Josh Elser Committed: Thu Jun 12 22:35:17 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/core/iterators/Combiner.java | 10 +++++----- .../accumulo/core/util/format/DefaultFormatter.java | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) ----------------------------------------------------------------------