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 AB5D610961 for ; Fri, 4 Apr 2014 16:32:47 +0000 (UTC) Received: (qmail 1746 invoked by uid 500); 4 Apr 2014 16:32:46 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 1612 invoked by uid 500); 4 Apr 2014 16:32:45 -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 1487 invoked by uid 99); 4 Apr 2014 16:32:42 -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, 04 Apr 2014 16:32:42 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CD77594ACD7; Fri, 4 Apr 2014 16:32:41 +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, 04 Apr 2014 16:32:46 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] git commit: Merge branch '1.6.0-SNAPSHOT' Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e176aa6a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e176aa6a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e176aa6a Branch: refs/heads/master Commit: e176aa6a1499c0c12482fd94c83e7e46061a1966 Parents: 4e3696f 6960570 Author: Josh Elser Authored: Fri Apr 4 12:32:37 2014 -0400 Committer: Josh Elser Committed: Fri Apr 4 12:32:37 2014 -0400 ---------------------------------------------------------------------- bin/accumulo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------