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 1EA4611A11 for ; Fri, 28 Mar 2014 21:26:29 +0000 (UTC) Received: (qmail 78827 invoked by uid 500); 28 Mar 2014 21:26:19 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 78557 invoked by uid 500); 28 Mar 2014 21:26:12 -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 78142 invoked by uid 99); 28 Mar 2014 21:26:06 -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, 28 Mar 2014 21:26:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4B17D91593B; Fri, 28 Mar 2014 21:26:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mdrob@apache.org To: commits@accumulo.apache.org Date: Fri, 28 Mar 2014 21:26:13 -0000 Message-Id: <7e5ed5ec5fa844ab937ab842886cb4f9@git.apache.org> In-Reply-To: <0b3952b892d5440cab12037f19dc4691@git.apache.org> References: <0b3952b892d5440cab12037f19dc4691@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/19] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT Merge branch '1.4.5-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/2cca3ee0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2cca3ee0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2cca3ee0 Branch: refs/heads/master Commit: 2cca3ee0c59ff4c746e6e9a51536033e591f9f70 Parents: 5b47924 9e5854f Author: Mike Drob Authored: Fri Mar 28 17:09:44 2014 -0400 Committer: Mike Drob Committed: Fri Mar 28 17:09:44 2014 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------