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 7590810936 for ; Fri, 7 Mar 2014 20:54:15 +0000 (UTC) Received: (qmail 21811 invoked by uid 500); 7 Mar 2014 20:53:26 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 21483 invoked by uid 500); 7 Mar 2014 20:53:22 -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 21150 invoked by uid 99); 7 Mar 2014 20:53:16 -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, 07 Mar 2014 20:53:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BC31493A84D; Fri, 7 Mar 2014 20:53:15 +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, 07 Mar 2014 20:53:22 -0000 Message-Id: <7cc667a47e7e4fb78d960adeaf000aa5@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [08/50] [abbrv] 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/e0571816 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e0571816 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e0571816 Branch: refs/heads/ACCUMULO-2061 Commit: e0571816af3bae8d3423d6020046d617cb6e6782 Parents: 18a5500 bee78fa Author: Mike Drob Authored: Tue Mar 4 08:33:04 2014 -0500 Committer: Mike Drob Committed: Tue Mar 4 08:33:04 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------