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 D6D5D10FDA for ; Thu, 30 Jan 2014 00:06:25 +0000 (UTC) Received: (qmail 8230 invoked by uid 500); 30 Jan 2014 00:06:19 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 8086 invoked by uid 500); 30 Jan 2014 00:06:17 -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 7992 invoked by uid 99); 30 Jan 2014 00:06:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Jan 2014 00:06:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 07C80910EB7; Thu, 30 Jan 2014 00:06:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vines@apache.org To: commits@accumulo.apache.org Date: Thu, 30 Jan 2014 00:06:16 -0000 Message-Id: In-Reply-To: <32351a0d30084e9ea4a0fdabe448492d@git.apache.org> References: <32351a0d30084e9ea4a0fdabe448492d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Merge remote-tracking branch 'origin/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/3751c67c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3751c67c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3751c67c Branch: refs/heads/1.6.0-SNAPSHOT Commit: 3751c67c3369691342da287cc717f76b2a971bd8 Parents: d4c9ee1 be26f79 Author: John Vines Authored: Wed Jan 29 19:06:02 2014 -0500 Committer: John Vines Committed: Wed Jan 29 19:06:02 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------