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 D781D113ED for ; Fri, 25 Apr 2014 23:12:50 +0000 (UTC) Received: (qmail 19133 invoked by uid 500); 25 Apr 2014 23:12:37 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 19012 invoked by uid 500); 25 Apr 2014 23:12:34 -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 18891 invoked by uid 99); 25 Apr 2014 23:12:32 -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, 25 Apr 2014 23:12:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 51D65952884; Fri, 25 Apr 2014 23:12:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: busbey@apache.org To: commits@accumulo.apache.org Date: Fri, 25 Apr 2014 23:12:46 -0000 Message-Id: <112d2b0911ad4310932ec21b230ad7db@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [17/17] 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/eae953e6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eae953e6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eae953e6 Branch: refs/heads/master Commit: eae953e6afd36885f502d368b946a35d380cb14d Parents: f277fea 448e757 Author: Sean Busbey Authored: Fri Apr 25 18:11:43 2014 -0500 Committer: Sean Busbey Committed: Fri Apr 25 18:11:43 2014 -0500 ---------------------------------------------------------------------- CHANGES | 73 ++++++++++++++++++++---------------------------------------- 1 file changed, 24 insertions(+), 49 deletions(-) ----------------------------------------------------------------------