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 1568A118C1 for ; Thu, 4 Sep 2014 15:58:13 +0000 (UTC) Received: (qmail 65557 invoked by uid 500); 4 Sep 2014 15:58:13 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 65438 invoked by uid 500); 4 Sep 2014 15:58:13 -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 65413 invoked by uid 99); 4 Sep 2014 15:58:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Sep 2014 15:58:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id ACC74A07D41; Thu, 4 Sep 2014 15:58:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kturner@apache.org To: commits@accumulo.apache.org Date: Thu, 04 Sep 2014 15:58:13 -0000 Message-Id: In-Reply-To: <146bc3422b9947e7a546b58e5eca4c99@git.apache.org> References: <146bc3422b9947e7a546b58e5eca4c99@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Merge branch '1.5.2-SNAPSHOT' into 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/2698ddea Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2698ddea Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2698ddea Branch: refs/heads/1.6.1-SNAPSHOT Commit: 2698ddea24252dc0ab44a239286ea2cc9b675093 Parents: fee5ec4 0a5ceca Author: Keith Turner Authored: Thu Sep 4 11:54:20 2014 -0400 Committer: Keith Turner Committed: Thu Sep 4 11:54:20 2014 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------