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 B70F210412 for ; Fri, 4 Apr 2014 20:34:13 +0000 (UTC) Received: (qmail 6679 invoked by uid 500); 4 Apr 2014 20:34:06 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 6627 invoked by uid 500); 4 Apr 2014 20:34:05 -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 5492 invoked by uid 99); 4 Apr 2014 20:33:47 -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 20:33:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CDB0B943266; Fri, 4 Apr 2014 20:33:46 +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 20:33:55 -0000 Message-Id: <0943e1f2c51a4a66b24384a4bfadab00@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/19] git commit: Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2cbe8874 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2cbe8874 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2cbe8874 Branch: refs/heads/master Commit: 2cbe887408aff6da0472ddc40bf8ea06c6dc94d8 Parents: e3e03be 83e65f2 Author: Mike Drob Authored: Fri Apr 4 11:31:00 2014 -0700 Committer: Mike Drob Committed: Fri Apr 4 11:31:00 2014 -0700 ---------------------------------------------------------------------- ----------------------------------------------------------------------