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 CD76410DDE for ; Mon, 24 Mar 2014 23:37:22 +0000 (UTC) Received: (qmail 32019 invoked by uid 500); 24 Mar 2014 23:37:17 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 31917 invoked by uid 500); 24 Mar 2014 23:37:15 -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 31838 invoked by uid 99); 24 Mar 2014 23:37:14 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Mar 2014 23:37:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 502E28BB0AD; Mon, 24 Mar 2014 23:37:14 +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: Mon, 24 Mar 2014 23:37:15 -0000 Message-Id: <73bfa3fbb26040268f6cfae4632f5e87@git.apache.org> In-Reply-To: <51b396251b7443b89fc7abb1400efb1e@git.apache.org> References: <51b396251b7443b89fc7abb1400efb1e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/5] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Merge branch '1.5.2-SNAPSHOT' into 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/bc1f026d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bc1f026d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bc1f026d Branch: refs/heads/master Commit: bc1f026d9b6fd584d46f0a66fd9a16a891ce8587 Parents: 04d51b3 ce6a721 Author: Mike Drob Authored: Mon Mar 24 16:42:36 2014 -0400 Committer: Mike Drob Committed: Mon Mar 24 16:42:36 2014 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------