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 2514B10207 for ; Fri, 21 Feb 2014 22:21:58 +0000 (UTC) Received: (qmail 73730 invoked by uid 500); 21 Feb 2014 22:21:22 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 73546 invoked by uid 500); 21 Feb 2014 22:21:16 -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 73379 invoked by uid 99); 21 Feb 2014 22:21:12 -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, 21 Feb 2014 22:21:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8337082F500; Fri, 21 Feb 2014 22:21:12 +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: Fri, 21 Feb 2014 22:21:22 -0000 Message-Id: <98195ac88e524a34b8bc12b7faeb3a79@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [12/12] 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/2563b14b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2563b14b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2563b14b Branch: refs/heads/master Commit: 2563b14b5315ee438c221193056417ca0abc5cc6 Parents: 51bcc29 6395840 Author: Josh Elser Authored: Fri Feb 21 14:20:58 2014 -0800 Committer: Josh Elser Committed: Fri Feb 21 14:20:58 2014 -0800 ---------------------------------------------------------------------- CHANGES | 12 ++++++++++++ 1 file changed, 12 insertions(+) ----------------------------------------------------------------------