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 9A22E182D7 for ; Wed, 24 Jun 2015 16:40:20 +0000 (UTC) Received: (qmail 87461 invoked by uid 500); 24 Jun 2015 16:40:20 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 87425 invoked by uid 500); 24 Jun 2015 16:40:20 -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 87338 invoked by uid 99); 24 Jun 2015 16:40:20 -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 16:40:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 54CD1E3608; Wed, 24 Jun 2015 16:40:20 +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 16:40:24 -0000 Message-Id: <3582e27646f34e6d809407984e1aa8ec@git.apache.org> In-Reply-To: <0cfa8728bf324abebddbd8b92b5deb72@git.apache.org> References: <0cfa8728bf324abebddbd8b92b5deb72@git.apache.org> 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/d0c1e9f1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d0c1e9f1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d0c1e9f1 Branch: refs/heads/1.7 Commit: d0c1e9f17a0908c1041cadd6fb90a44ffaf3db88 Parents: f1bc1dd af05876 Author: Josh Elser Authored: Wed Jun 24 12:39:53 2015 -0400 Committer: Josh Elser Committed: Wed Jun 24 12:39:53 2015 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------