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 A5D9B1056F for ; Tue, 25 Mar 2014 02:54:07 +0000 (UTC) Received: (qmail 55479 invoked by uid 500); 25 Mar 2014 02:54:01 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 55078 invoked by uid 500); 25 Mar 2014 02:53:53 -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 54536 invoked by uid 99); 25 Mar 2014 02:53:43 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Mar 2014 02:53:43 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 487528BB5B6; Tue, 25 Mar 2014 02:53:42 +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: Tue, 25 Mar 2014 02:53:53 -0000 Message-Id: <2897fc1518304b588a37bae0c839bc67@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [13/14] 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/e366e750 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e366e750 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e366e750 Branch: refs/heads/1.6.0-SNAPSHOT Commit: e366e75096dc652fb80cd48aeadfb46459f1189e Parents: 05254f3 e6748a8 Author: Mike Drob Authored: Mon Mar 24 22:52:32 2014 -0400 Committer: Mike Drob Committed: Mon Mar 24 22:52:32 2014 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------