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 400B411773 for ; Thu, 26 Jun 2014 15:31:40 +0000 (UTC) Received: (qmail 58499 invoked by uid 500); 26 Jun 2014 15:31:40 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 58406 invoked by uid 500); 26 Jun 2014 15:31:40 -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 58317 invoked by uid 99); 26 Jun 2014 15:31:40 -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, 26 Jun 2014 15:31:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DD1618A05E4; Thu, 26 Jun 2014 15:31:39 +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, 26 Jun 2014 15:31:43 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] 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/f573a14d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f573a14d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f573a14d Branch: refs/heads/1.6.1-SNAPSHOT Commit: f573a14dbe7e7ebdac6638cb13e0c0940fd925ed Parents: 045f7b2 f8861bf Author: Keith Turner Authored: Thu Jun 26 11:33:57 2014 -0400 Committer: Keith Turner Committed: Thu Jun 26 11:33:57 2014 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------