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 C1D4A10C61 for ; Mon, 2 Dec 2013 17:47:50 +0000 (UTC) Received: (qmail 40025 invoked by uid 500); 2 Dec 2013 17:47:49 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 39957 invoked by uid 500); 2 Dec 2013 17:47:49 -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 39940 invoked by uid 99); 2 Dec 2013 17:47:48 -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, 02 Dec 2013 17:47:48 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 804A891A541; Mon, 2 Dec 2013 17:47:48 +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, 02 Dec 2013 17:47:50 -0000 Message-Id: <8199ba7a89794c0a85dbffbbb71952ad@git.apache.org> In-Reply-To: <7340082830b543e4bc51440e29d03e9e@git.apache.org> References: <7340082830b543e4bc51440e29d03e9e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch '1.6.0-SNAPSHOT' Merge branch '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/811405af Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/811405af Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/811405af Branch: refs/heads/master Commit: 811405afedf976f3d53ad4076a5414b1dcd7226c Parents: f3a8677 29223f7 Author: Josh Elser Authored: Mon Dec 2 12:47:41 2013 -0500 Committer: Josh Elser Committed: Mon Dec 2 12:47:41 2013 -0500 ---------------------------------------------------------------------- README | 4 ++++ 1 file changed, 4 insertions(+) ----------------------------------------------------------------------