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 B4A2411CA5 for ; Fri, 12 Sep 2014 22:37:30 +0000 (UTC) Received: (qmail 58922 invoked by uid 500); 12 Sep 2014 22:37:30 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 58871 invoked by uid 500); 12 Sep 2014 22:37:30 -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 58860 invoked by uid 99); 12 Sep 2014 22:37:30 -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, 12 Sep 2014 22:37:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2EA3AA1274B; Fri, 12 Sep 2014 22:37:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Fri, 12 Sep 2014 22:37:33 -0000 Message-Id: <002d45302c15437c9a83111e407a3b10@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [04/16] 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/d8a4def0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d8a4def0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d8a4def0 Branch: refs/heads/1.6.1-SNAPSHOT Commit: d8a4def0d45c73602a4bd3437c49c1a99c29817c Parents: 2519b83 9b56159 Author: Christopher Tubbs Authored: Fri Sep 12 18:10:11 2014 -0400 Committer: Christopher Tubbs Committed: Fri Sep 12 18:10:11 2014 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------