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 B433D18643 for ; Wed, 24 Jun 2015 18:02:23 +0000 (UTC) Received: (qmail 24926 invoked by uid 500); 24 Jun 2015 18:02:23 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 24892 invoked by uid 500); 24 Jun 2015 18:02:23 -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 24648 invoked by uid 99); 24 Jun 2015 18:02:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Jun 2015 18:02:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 51431E3611; Wed, 24 Jun 2015 18:02:23 +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: Wed, 24 Jun 2015 18:02:27 -0000 Message-Id: <7ffbd3cba4bf483ba6b7fce22bb9e385@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/6] accumulo git commit: Merge branch '1.6' into 1.7 Merge branch '1.6' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d63bf7e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3d63bf7e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3d63bf7e Branch: refs/heads/1.7 Commit: 3d63bf7eb168296c9705a9815792985ae7ee5114 Parents: d0c1e9f 18d68fc Author: Josh Elser Authored: Wed Jun 24 13:58:53 2015 -0400 Committer: Josh Elser Committed: Wed Jun 24 13:58:53 2015 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------