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 0393F10B80 for ; Mon, 24 Feb 2014 17:51:07 +0000 (UTC) Received: (qmail 15857 invoked by uid 500); 24 Feb 2014 17:51:02 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 15816 invoked by uid 500); 24 Feb 2014 17:51:01 -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 15771 invoked by uid 99); 24 Feb 2014 17:51:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Feb 2014 17:51:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 86F24903868; Mon, 24 Feb 2014 17:51:00 +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: Mon, 24 Feb 2014 17:51:04 -0000 Message-Id: <637a9f2e8d22494586669af94cbf04e9@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Merge branch '1.5.1-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/d398aadb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d398aadb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d398aadb Branch: refs/heads/1.6.0-SNAPSHOT Commit: d398aadbd164f7b9a9d8f63d3c4bcfd7145040c0 Parents: 14d6b0b 3145cce Author: Josh Elser Authored: Mon Feb 24 12:50:45 2014 -0500 Committer: Josh Elser Committed: Mon Feb 24 12:50:45 2014 -0500 ---------------------------------------------------------------------- CHANGES | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d398aadb/CHANGES ----------------------------------------------------------------------